From a3dc8ad63937291432bb8ed0cef1de57e3eccefc Mon Sep 17 00:00:00 2001 From: djmaze Date: Mon, 16 Aug 2021 18:18:11 +0200 Subject: [PATCH] Drop unused allow_html_editor_source_button --- plugins/ckeditor/ckeditor.js | 3 +-- plugins/ckeditor/ckeditor.less | 4 ++++ snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 1 - .../v/0.0.0/app/libraries/RainLoop/Config/Application.php | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/ckeditor/ckeditor.js b/plugins/ckeditor/ckeditor.js index dd0ad7cc0..c5a8286ce 100644 --- a/plugins/ckeditor/ckeditor.js +++ b/plugins/ckeditor/ckeditor.js @@ -35,8 +35,7 @@ ], removePlugins: 'liststyle' + (rl.settings.app('allowHtmlEditorBitiButtons') ? '' : ',bidi'), - removeButtons: 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,SelectAll' - + (rl.settings.app('allowHtmlEditorSourceButton') ? '' : ',Source'), + removeButtons: 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,SelectAll', removeDialogTabs: 'link:advanced;link:target;image:advanced;images:advanced', extraPlugins: 'plain,signature', diff --git a/plugins/ckeditor/ckeditor.less b/plugins/ckeditor/ckeditor.less index 3a1349013..d8e75ab9f 100644 --- a/plugins/ckeditor/ckeditor.less +++ b/plugins/ckeditor/ckeditor.less @@ -211,3 +211,7 @@ line-height: 25px; } } + +.RL-PopupsCompose[data-wysiwyg*=Forced] .cke_button__plain { + display: none; +} diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index c0b8e42a2..0c49038b8 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -987,7 +987,6 @@ class Actions 'webVersionPath' => Utils::WebVersionPath(), 'token' => $oConfig->Get('security', 'csrf_protection', false) ? Utils::GetCsrfToken() : '', 'inIframe' => (bool)$oConfig->Get('labs', 'in_iframe', false), - 'allowHtmlEditorSourceButton' => (bool)$oConfig->Get('labs', 'allow_html_editor_source_button', false), 'allowHtmlEditorBitiButtons' => (bool)$oConfig->Get('labs', 'allow_html_editor_biti_buttons', false), 'allowCtrlEnterOnCompose' => (bool)$oConfig->Get('labs', 'allow_ctrl_enter_on_compose', false), 'hideSubmitButton' => (bool)$oConfig->Get('login', 'hide_submit_button', true), diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index 65261b35e..df3f2fe63 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -321,7 +321,6 @@ Enables caching in the system'), 'allow_message_append' => array(false), 'login_fault_delay' => array(1), 'log_ajax_response_write_limit' => array(300), - 'allow_html_editor_source_button' => array(false), 'allow_html_editor_biti_buttons' => array(false), 'allow_ctrl_enter_on_compose' => array(true), 'try_to_detect_hidden_images' => array(false),