Skip to content

Commit 51f5bb5

Browse files
fballianoempiricompany
fballiano
and
empiricompany
committed
Upgraded TinyMCE to 6.7.0 (#3220)
Co-authored-by: Tony <[email protected]> Co-authored-by: Tony <[email protected]>
1 parent dac0eee commit 51f5bb5

File tree

540 files changed

+7598
-112266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

540 files changed

+7598
-112266
lines changed

‎app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected function _prepareForm()
4141

4242
$form->addField($this->getData('editor_element_id'), 'editor', [
4343
'name' => 'content',
44-
'style' => 'width:725px;height:460px',
44+
'style' => 'height:460px',
4545
'required' => true,
4646
'force_load' => true,
4747
'config' => Mage::getSingleton('cms/wysiwyg_config')->getConfig($config)

‎app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ public function __construct()
3939

4040
$this->_formScripts[] = "
4141
function toggleEditor() {
42-
if (tinyMCE.getInstanceById('block_content') == null) {
43-
tinyMCE.execCommand('mceAddControl', false, 'block_content');
44-
} else {
45-
tinyMCE.execCommand('mceRemoveControl', false, 'block_content');
46-
}
42+
tinymce.execCommand('mceToggleEditor', false, wysiwygblock_content);
4743
}
4844
4945
function saveAndContinueEdit(){

‎app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,7 @@ protected function _prepareLayout()
105105

106106
$this->_formScripts[] = "
107107
function toggleEditor() {
108-
if (tinyMCE.getInstanceById('page_content') == null) {
109-
tinyMCE.execCommand('mceAddControl', false, 'page_content');
110-
} else {
111-
tinyMCE.execCommand('mceRemoveControl', false, 'page_content');
112-
}
108+
tinymce.execCommand('mceToggleEditor', false, wysiwygpage_content);
113109
}
114110
115111
function saveAndContinueEdit(urlTemplate) {

‎app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Skin.php

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php
2+
/**
3+
* OpenMage
4+
*
5+
* This source file is subject to the Open Software License (OSL 3.0)
6+
* that is bundled with this package in the file LICENSE.txt.
7+
* It is also available at https://opensource.org/license/osl-3-0-php
8+
*
9+
* @category Mage
10+
* @package Mage_Adminhtml
11+
* @copyright Copyright (c) 2023 The OpenMage Contributors (https://www.openmage.org)
12+
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
13+
*/
14+
15+
/**
16+
* Configuration source model for Wysiwyg skin
17+
*
18+
* @category Mage
19+
* @package Mage_Adminhtml
20+
*/
21+
class Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Skin
22+
{
23+
public function toOptionArray()
24+
{
25+
return [
26+
[
27+
'value' => 'oxide',
28+
'label' => 'Oxide'
29+
],
30+
[
31+
'value' => 'oxide-dark',
32+
'label' => 'Oxide Dark'
33+
],
34+
[
35+
'value' => 'tinymce-5',
36+
'label' => 'Tinymce 5'
37+
],
38+
[
39+
'value' => 'tinymce-5-dark',
40+
'label' => 'Tinymce 5 Dark'
41+
]
42+
];
43+
}
44+
}

‎app/code/core/Mage/Cms/Model/Wysiwyg/Config.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ class Mage_Cms_Model_Wysiwyg_Config extends Varien_Object
4949
*/
5050
public const WYSIWYG_SKIN_IMAGE_PLACEHOLDER_FILE = 'images/wysiwyg/skin_image.png';
5151

52+
public const WYSIWYG_LOCALES = ['ar','az','be','bg_BG','bn_BD','ca','cs','cy','da','de','dv','el','eo','es','es_MX','et','eu','fa','fi','fr_FR','ga','gl','he_IL','hi','hr','hu_HU','hy','id','is_IS','it','ja','ka_GE','kab','kk','ko_KR','ku','lt','lv','nb_NO','ne','nl','nl_BE','oc','pl','pt_BR','ro','ru','sk','sl_SI','sq','sr','sv_SE','ta','tg','th_TH','tr','ug','uk','uz','vi','zh-Hans','zh-Hant','zh_HK','zh_MO','zh_SG'];
53+
5254
/**
5355
* Return Wysiwyg config as Varien_Object
5456
*
@@ -69,25 +71,23 @@ public function getConfig($data = [])
6971
{
7072
$config = new Varien_Object();
7173

74+
$locale = Mage::app()->getLocale()->getLocaleCode();
75+
$lang = in_array($locale, self::WYSIWYG_LOCALES) ? $locale : substr($locale, 0, 2);
7276
$config->setData([
7377
'enabled' => $this->isEnabled(),
7478
'hidden' => $this->isHidden(),
79+
'skin' => Mage::getStoreConfig('cms/wysiwyg/skin'),
7580
'use_container' => false,
7681
'add_variables' => Mage::getSingleton('admin/session')->isAllowed('system/variable'),
7782
'add_widgets' => Mage::getSingleton('admin/session')->isAllowed('cms/widget_instance'),
7883
'no_display' => false,
7984
'translator' => Mage::helper('cms'),
8085
'encode_directives' => true,
8186
'directives_url' => Mage::getSingleton('adminhtml/url')->getUrl('*/cms_wysiwyg/directive'),
82-
'popup_css' =>
83-
Mage::getBaseUrl('js') . 'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css',
84-
'content_css' =>
85-
Mage::getBaseUrl('js') . 'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css',
8687
'width' => '100%',
8788
'plugins' => [],
88-
'media_disable_flash' => true
89+
'lang' => $lang
8990
]);
90-
9191
$config->setData('directives_url_quoted', preg_quote($config->getData('directives_url')));
9292

9393
if (Mage::getSingleton('admin/session')->isAllowed('cms/media_gallery')) {

‎app/code/core/Mage/Cms/etc/config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@
201201
<cms>
202202
<wysiwyg>
203203
<enabled>enabled</enabled>
204+
<skin>oxide</skin>
204205
</wysiwyg>
205206
</cms>
206207
<system>

‎app/code/core/Mage/Cms/etc/system.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,20 @@
8484
<show_in_website>1</show_in_website>
8585
<show_in_store>1</show_in_store>
8686
</enabled>
87+
<skin translate="label">
88+
<label>Skin WYSIWYG Editor</label>
89+
<frontend_type>select</frontend_type>
90+
<source_model>adminhtml/system_config_source_cms_wysiwyg_skin</source_model>
91+
<sort_order>1</sort_order>
92+
<show_in_default>1</show_in_default>
93+
<show_in_website>1</show_in_website>
94+
<show_in_store>1</show_in_store>
95+
<depends>
96+
<enabled separator="|">
97+
<value>enabled|hidden</value>
98+
</enabled>
99+
</depends>
100+
</skin>
87101
</fields>
88102
</wysiwyg>
89103
</groups>

‎app/code/core/Mage/Core/Model/Variable/Config.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ public function getWysiwygPluginSettings($config)
3232
$variableConfig = [];
3333
$onclickParts = [
3434
'search' => ['html_id'],
35-
'subject' => 'MagentovariablePlugin.loadChooser(\'' . $this->getVariablesWysiwygActionUrl() . '\', \'{{html_id}}\');'
35+
'subject' => 'OpenmagevariablePlugin.loadChooser(\'' . $this->getVariablesWysiwygActionUrl() . '\', \'{{html_id}}\');'
3636
];
37-
$variableWysiwygPlugin = [['name' => 'magentovariable',
37+
$variableWysiwygPlugin = [['name' => 'openmagevariable',
3838
'src' => $this->getWysiwygJsPluginSrc(),
3939
'options' => [
4040
'title' => Mage::helper('adminhtml')->__('Insert Variable...'),
@@ -54,7 +54,7 @@ public function getWysiwygPluginSettings($config)
5454
*/
5555
public function getWysiwygJsPluginSrc()
5656
{
57-
return Mage::getBaseUrl('js') . 'mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js';
57+
return Mage::getBaseUrl('js') . 'mage/adminhtml/wysiwyg/tinymce/plugins/openmagevariable.js';
5858
}
5959

6060
/**

‎app/code/core/Mage/Widget/Model/Widget/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Mage_Widget_Model_Widget_Config extends Varien_Object
3030
public function getPluginSettings($config)
3131
{
3232
return [
33-
'widget_plugin_src' => Mage::getBaseUrl('js') . 'mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js',
33+
'widget_plugin_src' => Mage::getBaseUrl('js') . 'mage/adminhtml/wysiwyg/tinymce/plugins/openmagewidget.js',
3434
'widget_images_url' => $this->getPlaceholderImagesBaseUrl(),
3535
'widget_placeholders' => $this->getAvailablePlaceholderFilenames(),
3636
'widget_window_url' => $this->getWidgetWindowUrl($config)

‎app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ public function indexAction()
3434
{
3535
// save extra params for widgets insertion form
3636
$skipped = $this->getRequest()->getParam('skip_widgets');
37-
$skipped = Mage::getSingleton('widget/widget_config')->decodeWidgetsFromQuery($skipped);
37+
if (is_string($skipped)) {
38+
$skipped = Mage::getSingleton('widget/widget_config')->decodeWidgetsFromQuery($skipped);
39+
}
3840

3941
Mage::register('skip_widgets', $skipped);
40-
4142
$this->loadLayout('empty')->renderLayout();
4243
}
4344

‎app/design/adminhtml/default/default/layout/main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Default layout, loads most of the pages
8686

8787
<action method="addItem"><type>js</type><name>mage/adminhtml/rules.js</name><params/><if/><condition>can_load_rules_js</condition></action>
8888

89-
<action method="addItem"><type>js</type><name>mage/adminhtml/wysiwyg/tiny_mce/setup.js</name><params/><if/><condition>can_load_tiny_mce</condition></action>
89+
<action method="addItem"><type>js</type><name>mage/adminhtml/wysiwyg/tinymce/setup.js</name><params/><if/><condition>can_load_tiny_mce</condition></action>
9090

9191
<block type="core/html_calendar" name="head.calendar" as="calendar" template="page/js/calendar.phtml"/>
9292
</block>

‎app/design/adminhtml/default/default/layout/oauth.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<action method="removeItem"><type>js</type><name>mage/adminhtml/uploader.js</name></action>
8585
<action method="removeItem"><type>js</type><name>mage/adminhtml/product.js</name></action>
8686
<action method="removeItem"><type>js</type><name>mage/adminhtml/rules.js</name></action>
87-
<action method="removeItem"><type>js</type><name>mage/adminhtml/wysiwyg/tiny_mce/setup.js</name></action>
87+
<action method="removeItem"><type>js</type><name>mage/adminhtml/wysiwyg/tinymce/setup.js</name></action>
8888

8989
<action method="removeItem"><type>css</type><name>print.css</name></action>
9090
<action method="removeItem"><type>js_css</type><name>calendar/calendar-win2k-1.css</name></action>

‎app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ var catalogWysiwygEditor = {
7373
if (dialogWindow.options.firedElementId) {
7474
wysiwygObj = eval('wysiwyg'+dialogWindow.options.firedElementId+'_editor');
7575
wysiwygObj.turnOff();
76-
if (tinyMCE.get(wysiwygObj.id)) {
77-
$(dialogWindow.options.firedElementId).value = tinyMCE.get(wysiwygObj.id).getContent();
76+
if (tinymce.get(wysiwygObj.id)) {
77+
$(dialogWindow.options.firedElementId).value = tinymce.get(wysiwygObj.id).getContent();
7878
} else {
7979
if ($(dialogWindow.options.firedElementId+'_editor')) {
8080
$(dialogWindow.options.firedElementId).value = $(dialogWindow.options.firedElementId+'_editor').value;
@@ -94,8 +94,8 @@ var catalogWysiwygEditor = {
9494

9595
//destroy the instance of editor
9696
wysiwygObj = eval('wysiwyg'+dialogWindow.options.firedElementId+'_editor');
97-
if (tinyMCE.get(wysiwygObj.id)) {
98-
tinyMCE.execCommand('mceRemoveControl', true, wysiwygObj.id);
97+
if (tinymce.get(wysiwygObj.id)) {
98+
tinymce.get(wysiwygObj.id).remove();
9999
}
100100

101101
dialogWindow.close();

‎app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ var queueControl = {
6060
queueForm.submit();
6161
},
6262
preview: function() {
63-
if (this.isEditor() && tinyMCE.get(this.id)) {
64-
tinyMCE.triggerSave();
63+
if (this.isEditor() && tinymce.get(this.id)) {
64+
tinymce.triggerSave();
6565
$('preview_text').value = $(this.id).value;
66-
tinyMCE.triggerSave();
66+
tinymce.triggerSave();
6767
} else {
6868
$('preview_text').value = $(this.id).value;
6969
}
@@ -77,7 +77,7 @@ var queueControl = {
7777
return false;
7878
},
7979
isEditor: function() {
80-
return (typeof tinyMceEditors != 'undefined' && tinyMceEditors.get(this.id) != undefined)
80+
return (typeof tinyMceEditors != 'undefined' && tinyMceEditors[this.id] != undefined)
8181
},
8282
resume: function() {
8383
$('_resume_flag').value = '1';

‎app/design/adminhtml/default/default/template/newsletter/template/edit.phtml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
$('change_flag_element').value = '1';
103103
}
104104
if(this.isEditor()) {
105-
tinyMCE.triggerSave();
105+
tinymce.triggerSave();
106106
}
107107
templateForm.submit();
108108
return false;
@@ -129,7 +129,7 @@
129129
$('save_as_flag').value = '1';
130130

131131
if(this.isEditor()) {
132-
tinyMCE.triggerSave();
132+
tinymce.triggerSave();
133133
}
134134
templateForm.submit();
135135
return false;
@@ -141,10 +141,10 @@
141141
} else {
142142
$('preview_type').value = 2;
143143
}
144-
if (this.isEditor() && tinyMCE.get(this.id)) {
145-
tinyMCE.triggerSave();
144+
if (this.isEditor() && tinymce.get(this.id)) {
145+
tinymce.triggerSave();
146146
$('preview_text').value = $(this.id).value;
147-
tinyMCE.triggerSave();
147+
tinymce.triggerSave();
148148
} else {
149149
$('preview_text').value = $(this.id).value;
150150
}
@@ -165,11 +165,11 @@
165165
},
166166

167167
isEditor: function() {
168-
return (typeof tinyMceEditors != 'undefined' && tinyMceEditors.get(this.id) != undefined)
168+
return (typeof tinyMceEditors != 'undefined' && tinyMceEditors[this.id] != undefined)
169169
},
170170

171171
getEditor: function() {
172-
return tinyMceEditors.get(this.id);
172+
return tinyMceEditors[this.id];
173173
}
174174
};
175175

‎app/design/adminhtml/default/default/template/page/head.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<?php endif ?>
4343

4444
<?php if ($this->getCanLoadTinyMce()): // TinyMCE is broken when loaded through index.php?>
45-
<script type="text/javascript" src="<?php echo $this->getJsUrl() ?>tiny_mce/tiny_mce.js"></script>
45+
<script type="text/javascript" src="<?php echo $this->getJsUrl() ?>tinymce/tinymce.min.js"></script>
4646
<?php endif ?>
4747

4848
<script type="text/javascript">

‎app/design/adminhtml/default/default/template/system/email/template/edit.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@
155155
} else {
156156
$('preview_type').value = 2;
157157
}
158-
if (typeof tinyMCE == 'undefined' || !tinyMCE.getInstanceById('template_text')) {
158+
if (typeof tinymce == 'undefined' || !tinymce.get('template_text')) {
159159
$('preview_text').value = $('template_text').value;
160160
} else {
161-
$('preview_text').value = tinyMCE.getInstanceById('template_text').getHTML();
161+
$('preview_text').value = tinymce.get('template_text').getContent();
162162
}
163163

164164
if ($('template_styles') != undefined) {

‎app/design/adminhtml/default/default/template/widget/form/element.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
case 'wysiwyg': ?>
6868
<span class="form_row">
6969
<label for="<?php echo $element->getHtmlId() ?>"><?php echo $element->getLabel() ?>:</label>
70-
<script type="text/javascript" src="<?php echo Mage::getBaseUrl('js') ?>tiny_mce/tiny_mce.js"></script>
70+
<script type="text/javascript" src="<?php echo Mage::getBaseUrl('js') ?>tinymce/tinymce.min.js"></script>
7171
<script type="text/javascript">
7272
//<![CDATA[
7373
tinyMCE.init({

0 commit comments

Comments
 (0)