From c87b2cd4e2c1f665f78b5bf77513292797241da4 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 25 Apr 2023 18:12:41 +0100 Subject: [PATCH] Coverted part of the "variable" plugin --- .../Mage/Adminhtml/Block/Cms/Block/Edit.php | 2 +- .../Mage/Adminhtml/Block/Cms/Page/Edit.php | 2 +- .../core/Mage/Core/Model/Variable/Config.php | 4 ++-- .../core/Mage/Widget/Model/Widget/Config.php | 2 +- .../plugins/magentovariable/img/icon.gif | Bin 91 -> 0 bytes .../plugins/magentowidget/img/icon.gif | Bin 631 -> 0 bytes .../openmagevariable}/editor_plugin.js | 22 ++++++++---------- .../plugins/openmagewidget}/editor_plugin.js | 2 +- .../wysiwyg/{tiny_mce => tinymce}/setup.js | 0 .../themes/advanced/skins/default/content.css | 0 .../themes/advanced/skins/default/dialog.css | 0 11 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/img/icon.gif delete mode 100644 js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/img/icon.gif rename js/mage/adminhtml/wysiwyg/{tiny_mce/plugins/magentovariable => tinymce/plugins/openmagevariable}/editor_plugin.js (56%) rename js/mage/adminhtml/wysiwyg/{tiny_mce/plugins/magentowidget => tinymce/plugins/openmagewidget}/editor_plugin.js (96%) rename js/mage/adminhtml/wysiwyg/{tiny_mce => tinymce}/setup.js (100%) rename js/mage/adminhtml/wysiwyg/{tiny_mce => tinymce}/themes/advanced/skins/default/content.css (100%) rename js/mage/adminhtml/wysiwyg/{tiny_mce => tinymce}/themes/advanced/skins/default/dialog.css (100%) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php index 7d50ccf3125..da6739c8ae0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php @@ -40,7 +40,7 @@ public function __construct() $this->_formScripts[] = " function toggleEditor() { if (tinymce.get('block_content') === null) { - tinymce.init({selector: 'textarea#block_content', branding: false, promotion: false, plugins: 'lists advlist directionality image link media nonbreaking preview quickbars'}); + tinymce.init({selector: 'textarea#block_content', branding: false, promotion: false, plugins: 'lists advlist directionality image link media nonbreaking preview quickbars openmagevariable'}); } else { tinymce.get('block_content').remove(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php index ee144a4ffdc..8173a6190c5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php @@ -106,7 +106,7 @@ protected function _prepareLayout() $this->_formScripts[] = " function toggleEditor() { if (tinymce.get('page_content') === null) { - tinymce.init({selector: 'textarea#page_content', branding: false, promotion: false, plugins: 'lists advlist directionality image link media nonbreaking preview quickbars'}); + tinymce.init({selector: 'textarea#page_content', branding: false, promotion: false, plugins: 'lists advlist directionality image link media nonbreaking preview quickbars openmagevariable'}); } else { tinymce.get('page_content').remove(); } diff --git a/app/code/core/Mage/Core/Model/Variable/Config.php b/app/code/core/Mage/Core/Model/Variable/Config.php index afe9cfa5ebc..939a79c52d3 100644 --- a/app/code/core/Mage/Core/Model/Variable/Config.php +++ b/app/code/core/Mage/Core/Model/Variable/Config.php @@ -34,7 +34,7 @@ public function getWysiwygPluginSettings($config) 'search' => ['html_id'], 'subject' => 'MagentovariablePlugin.loadChooser(\'' . $this->getVariablesWysiwygActionUrl() . '\', \'{{html_id}}\');' ]; - $variableWysiwygPlugin = [['name' => 'magentovariable', + $variableWysiwygPlugin = [['name' => 'openmagevariable', 'src' => $this->getWysiwygJsPluginSrc(), 'options' => [ 'title' => Mage::helper('adminhtml')->__('Insert Variable...'), @@ -54,7 +54,7 @@ public function getWysiwygPluginSettings($config) */ public function getWysiwygJsPluginSrc() { - return Mage::getBaseUrl('js') . 'mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js'; + return Mage::getBaseUrl('js') . 'mage/adminhtml/wysiwyg/tiny_mce/plugins/openmagevariable/editor_plugin.js'; } /** diff --git a/app/code/core/Mage/Widget/Model/Widget/Config.php b/app/code/core/Mage/Widget/Model/Widget/Config.php index 99468a73c86..f77f63910e3 100644 --- a/app/code/core/Mage/Widget/Model/Widget/Config.php +++ b/app/code/core/Mage/Widget/Model/Widget/Config.php @@ -30,7 +30,7 @@ class Mage_Widget_Model_Widget_Config extends Varien_Object public function getPluginSettings($config) { return [ - 'widget_plugin_src' => Mage::getBaseUrl('js') . 'mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js', + 'widget_plugin_src' => Mage::getBaseUrl('js') . 'mage/adminhtml/wysiwyg/tiny_mce/plugins/openmagewidget/editor_plugin.js', 'widget_images_url' => $this->getPlaceholderImagesBaseUrl(), 'widget_placeholders' => $this->getAvailablePlaceholderFilenames(), 'widget_window_url' => $this->getWidgetWindowUrl($config) diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/img/icon.gif b/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/img/icon.gif deleted file mode 100644 index 9139c542903cdc68049f5c6a81e47a8c1fb251da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 91 zcmZ?wbhEHb6k!lyXkcV`T_nrEz@Ye(g^_`QkwFK@28xR?FfbYQ^shYqman19H!N-K uNsAZCwH_9g-0gXs>DzQxEPMOvRBGDgMLSn-zP&S{Y)bpb4i_;725SIm zudx4gbp7|KnKy6T`0)DK+SO~9Em`*Y{JwYZ-aUHs;M4U}pSREcJ}KqHyVp56Ip1>) zzULc#S>5@0-;y8gp=(yH`C0AqvnA-m`!}C29{4&T>06!0hZm2&Pf1^#88Bf&|Ia%2 z@87>KU9|K}M@E*j;foi~GBvn=6q>%ib>YkEu9p!KpZ6?YxoqXzw{O37M?Gn%e?L9% z+r09xtGh}{imy*7`VlX6>g1^({fTEzocVNO%ZInGKA+tB;pLOOyxgx#8h&&|e!6`4 zSc1{d2JbdAq0a|brlqA`x^(Ghli%l~>pwoc@gqUz+_k=MZNcl-toypQS6f!>^Ex8f| zpEtiuGw^0+|HJMeuiIDR`1}kjBNMaG8jk}4PGU@{9EUCzE|YEIfUobZTEk=x?R z#$tm7DlHs#dt?qN6!FNgnQ%B%GHCWNFoc { - ed.addCommand('mceMagentovariable', function() { - var pluginSettings = ed.settings.magentoPluginsOptions.get('magentovariable'); - MagentovariablePlugin.setEditor(ed); - MagentovariablePlugin.loadChooser(pluginSettings.url, null); - }); - - // Register Widget plugin button - ed.addButton('magentovariable', { - title : 'magentovariable.insert_variable', - cmd : 'mceMagentovariable', - image : url + '/img/icon.gif' +tinymce.PluginManager.add('openmagevariable', (ed, url) => { + //TODO: the button doesn't show on the toolbar + ed.ui.registry.addButton('openmagevariable', { + text: 'Insert Variable', + onAction: () => { + //TODO: the code of this method needs to be converted to tinymce6 + var pluginSettings = ed.settings.magentoPluginsOptions.get('openmagevariable'); + openmagevariable.setEditor(ed); + openmagevariable.loadChooser(pluginSettings.url, null); + } }); return { diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagewidget/editor_plugin.js similarity index 96% rename from js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js rename to js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagewidget/editor_plugin.js index 38c02d84029..113f88a912e 100644 --- a/js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js +++ b/js/mage/adminhtml/wysiwyg/tinymce/plugins/openmagewidget/editor_plugin.js @@ -12,7 +12,7 @@ * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ -tinymce.PluginManager.add('OpenMageWidgetPlugin', (ed, url) => { +tinymce.PluginManager.add('openmagewidget', (ed, url) => { ed.addCommand('mceMagentowidget', function() { widgetTools.openDialog(ed.settings.magentowidget_url + 'widget_target_id/' + ed.getElement().id + '/'); }); diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/js/mage/adminhtml/wysiwyg/tinymce/setup.js similarity index 100% rename from js/mage/adminhtml/wysiwyg/tiny_mce/setup.js rename to js/mage/adminhtml/wysiwyg/tinymce/setup.js diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css b/js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/content.css similarity index 100% rename from js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css rename to js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/content.css diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css b/js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/dialog.css similarity index 100% rename from js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css rename to js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/dialog.css