Skip to content

Commit 2bab153

Browse files
committed
AC-12726::[2.4.8-beta1] TinyMCE 5 migration to TinyMCE 7
1 parent b3fd720 commit 2bab153

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

app/code/Magento/Cms/etc/adminhtml/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<argument name="adapterOptions" xsi:type="array">
3939
<item name="tinymce" xsi:type="array">
4040
<item name="value" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</item>
41-
<item name="label" xsi:type="string" translatable="true">TinyMCE 5</item>
41+
<item name="label" xsi:type="string" translatable="true">TinyMCE 7</item>
4242
</item>
4343
</argument>
4444
</arguments>

lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ define([
1313
'mage/adminhtml/tools'
1414
], function (configDirectiveGenerator, customDirectiveGenerator, wysiwyg, jQuery) {
1515
return function (config) {
16-
var self = null;
17-
var magentovariable = function (editor) {
16+
var self = null ,
17+
magentovariable = function (editor) {
1818
this.widget = {
1919
/**
2020
* Encode variables in content
@@ -23,7 +23,7 @@ define([
2323
* @returns {*}
2424
*/
2525
encodeVariables: function (content) {
26-
content = content.gsub(/\{\{config path=\"([^\"]+)\"\}\}/i, function (match) {
26+
content = content.gsub(/\{\{config path="([^\"]+)"\}\}/i, function (match) {
2727
var path = match[1],
2828
magentoVariables,
2929
imageHtml;
@@ -46,7 +46,7 @@ define([
4646
return imageHtml.replace('%id', Base64.idEncode(path));
4747
});
4848

49-
content = content.gsub(/\{\{customVar code=([^\}\"]+)\}\}/i, function (match) {
49+
content = content.gsub(/\{\{customVar code=([^\}"]+)\}\}/i, function (match) {
5050
var path = match[1],
5151
magentoVariables,
5252
imageHtml;

lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ define([
1111
'mage/adminhtml/wysiwyg/widget'
1212
], function (wysiwyg, varienGlobalEvents) {
1313
return function (config) {
14-
var self = null;
15-
var magentowidget = function (editor) {
14+
var self = null,
15+
magentowidget = function (editor) {
1616
this.widget = {
1717
/**
1818
* @param {Object} placeholder - Contains the selected node

0 commit comments

Comments
 (0)