From 1398ca35acff1371e9fc62fb99599d0a7333601b Mon Sep 17 00:00:00 2001 From: Francisco <54645175+franciscoarocas@users.noreply.github.com> Date: Mon, 31 Aug 2020 16:45:00 +0100 Subject: [PATCH] Fixed bugs with Sceditor --- admin/main.php | 22 ------------- admin/panels/config/admin.config.php | 1 - admin/panels/config/admin.config.tpl | 6 ---- admin/panels/entry/admin.entry.write.php | 2 -- admin/panels/entry/admin.entry.write.tpl | 6 ++-- admin/panels/static/admin.static.write.php | 1 - admin/panels/static/admin.static.write.tpl | 7 +++-- admin/res/admin.css | 4 +++ admin/res/admin.js | 31 +++++++++++++------ .../sceditor/plugins/flatPressFileManager.js | 8 ++--- 10 files changed, 37 insertions(+), 51 deletions(-) diff --git a/admin/main.php b/admin/main.php index cfc4b6a..4c4e66b 100755 --- a/admin/main.php +++ b/admin/main.php @@ -7,28 +7,6 @@ include(ADMIN_DIR.'panels/admin.defaultpanels.php'); include(ADMIN_DIR.'includes/panels.prototypes.php'); require(SMARTY_DIR . 'SmartyValidate.class.php'); - - // SCEditor Config - // In this file will check if SCEditor use BBCODE or HTML - // BBCode = 0 and HTML = 1 - function get_sceditor_option() { - global $fp_config; - if (!isset($fp_config['general']['sceditor_display'])) { - $fp_config['general']['sceditor_display'] = 0; // BBCode as default - config_save(); - } - return $fp_config['general']['sceditor_display']; - } - - function get_sceditor_display_value() { - switch (get_sceditor_option()) { - case 0 : return 'bbcode'; - case 1 : return 'xhtml'; - case 2 : return 'disable'; - default : return 'bbcode'; - } - } - // End SCEditor Config utils_nocache_headers(); diff --git a/admin/panels/config/admin.config.php b/admin/panels/config/admin.config.php index 1d1f136..8c314bc 100755 --- a/admin/panels/config/admin.config.php +++ b/admin/panels/config/admin.config.php @@ -34,7 +34,6 @@ function setup() { $this->smarty->assign('themes', theme_list()); $this->smarty->assign('lang_list', lang_list()); - $this->smarty->assign("sceditor_display", get_sceditor_display_value()); $static_list = array(); diff --git a/admin/panels/config/admin.config.tpl b/admin/panels/config/admin.config.tpl index 2bab6e7..deb3765 100755 --- a/admin/panels/config/admin.config.tpl +++ b/admin/panels/config/admin.config.tpl @@ -64,12 +64,6 @@
-
-
diff --git a/admin/panels/entry/admin.entry.write.php b/admin/panels/entry/admin.entry.write.php index ebf78a4..e35040d 100755 --- a/admin/panels/entry/admin.entry.write.php +++ b/admin/panels/entry/admin.entry.write.php @@ -79,8 +79,6 @@ $this->id = @$_REQUEST['entry']; $this->smarty->assign('id', $this->id); - // SCEditor Smarty - $this->smarty->assign("sceditor_display", get_sceditor_display_value()); global $fp_config; $this->smarty->assign("lang_locale", $fp_config['locale']['lang']); } diff --git a/admin/panels/entry/admin.entry.write.tpl b/admin/panels/entry/admin.entry.write.tpl index 5f809a1..8c03ca6 100755 --- a/admin/panels/entry/admin.entry.write.tpl +++ b/admin/panels/entry/admin.entry.write.tpl @@ -41,16 +41,18 @@ + + + + {/literal} {/if} diff --git a/admin/res/admin.css b/admin/res/admin.css index e0699b5..3fa7ac8 100755 --- a/admin/res/admin.css +++ b/admin/res/admin.css @@ -712,6 +712,10 @@ img { background-position: 0px -416px !important; } +.sceditor-container textarea { + color: #111 !important; +} + /* Modal to upload files */ #flatpress-files-modal .modal-header { diff --git a/admin/res/admin.js b/admin/res/admin.js index 96bcda1..575d6c2 100644 --- a/admin/res/admin.js +++ b/admin/res/admin.js @@ -31,18 +31,14 @@ function mobile_open_button() { } // End Responsive functions -// Editor media functions -// Create the button -function set_media_button() { - let button = '
'; - $( ".sceditor-toolbar" ).append(button); -} - let mediaManagerRoute = ''; +let insertSCEditorFunction; + /* Functions of FileManager */ // Open the botton -function open_media_manager() { +function open_media_manager(insertSCEditor) { + insertSCEditorFunction = insertSCEditor; mediaManagerRoute = ''; $('#flatpress-files-modal').modal('show'); $.post('ajax.php', {Operation : 'ListMediaDirectory', Arguments : mediaManagerRoute}, function(data) { @@ -122,6 +118,8 @@ function openNewDirectory(DirectoryName) { function openNewFile(FileName) { const fileType = detectTypeFile(FileName); const functionType = FUNCTION_BY_FILE_FORMAT.get(fileType); + selectedFile = FileName; + selectedURL = mediaManagerRoute; functionType(FileName); } @@ -158,7 +156,7 @@ function detectTypeFile(FileName) { const FUNCTION_BY_FILE_FORMAT = new Map(); -const INSERT_MEDIA_BUTTON = ''; +const INSERT_MEDIA_BUTTON = ''; FUNCTION_BY_FILE_FORMAT.set(IMAGE, function(imageURL) { const img = ''; @@ -176,6 +174,19 @@ function changeMediaPreviewContent(content) { modalFooter.innerHTML = INSERT_MEDIA_BUTTON; } +let selectedURL; +let selectedFile; + function insertMediaInSceditor() { - + /* Onyl bbcode at the moment */ + const fileType = detectTypeFile(selectedFile); + switch(fileType) { + case IMAGE: { + insertSCEditorFunction('[img]' + selectedURL + selectedFile + '[/img]') + break; + } + default: { /* Other files = url link */ + insertSCEditorFunction('[url=' + selectedURL + selectedFile + ']' + selectedFile +'[/url]') + } + } } \ No newline at end of file diff --git a/admin/res/sceditor/plugins/flatPressFileManager.js b/admin/res/sceditor/plugins/flatPressFileManager.js index 665b9e8..d50ee0c 100644 --- a/admin/res/sceditor/plugins/flatPressFileManager.js +++ b/admin/res/sceditor/plugins/flatPressFileManager.js @@ -17,11 +17,11 @@ sceditor.command.set('flatPressFileManager', { An a open bootstrap modal function The modal html is in the .tpl file, where sceditor is included */ - open_media_manager(); + open_media_manager(this.insert); }, - tooltip: 'Open FlatPress File Manager' + tooltip: 'Open FlatPress File Manager', }); - + (function (sceditor) { 'use strict'; @@ -32,4 +32,4 @@ sceditor.command.set('flatPressFileManager', { this.init = function () { }; }; -}(sceditor)); +}(sceditor)); \ No newline at end of file