rhoerr · rhoerr · Oct 28, 2024 · Oct 24, 2024 · Oct 24, 2024 · Oct 24, 2024
diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
@@ -22,6 +22,7 @@
                 <minify_files>0</minify_files>
                 <minify_exclude>
                     <tiny_mce>/tiny_mce/</tiny_mce>
+                    <tiny_mce_6>/tiny_mce_6/</tiny_mce_6>
                 </minify_exclude>
             </js>
             <css>

diff --git a/app/code/Magento/Ui/view/base/requirejs-config.js b/app/code/Magento/Ui/view/base/requirejs-config.js
@@ -8,7 +8,7 @@ var config = {
     shim: {
         'chartjs/chartjs-adapter-moment': ['moment'],
         'chartjs/es6-shim.min': {},
-        'tiny_mce_7/tinymce.min': {
+        'tiny_mce_6/tinymce.min': {
             exports: 'tinyMCE'
         }
     },
@@ -28,7 +28,7 @@ var config = {
             buttonAdapter:  'Magento_Ui/js/form/button-adapter',
             chartJs:        'chartjs/Chart.min',
             'chart.js':     'chartjs/Chart.min',
-            tinymce:        'tiny_mce_7/tinymce.min',
+            tinymce:        'tiny_mce_6/tinymce.min',
             wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter'
         }
     }

diff --git a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
@@ -18,8 +18,8 @@ lib/web/prototype/**/*.js
 // MINIFIED FILES
 app/code/**/*.min.js
 lib/web/legacy-build.min.js
-lib/web/tiny_mce_7/**/*.js
-lib/web/tiny_mce_7/***/*.js
+lib/web/tiny_mce_6/**/*.js
+lib/web/tiny_mce_6/***/*.js
 
 // TEST
 vendor/magento/magento-coding-standard/Magento2/Tests/Eslint/*
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
@@ -75,23 +75,23 @@
             <word>rma</word>
         </item>
         <item>
-            <path>lib/web/tiny_mce_7/plugins/help/plugin.min.js</path>
+            <path>lib/web/tiny_mce_6/plugins/help/plugin.min.js</path>
             <word>CHANGELOG</word>
         </item>
         <item>
-            <path>lib/web/tiny_mce_7/plugins/emoticons/js/emojis.min.js</path>
+            <path>lib/web/tiny_mce_6/plugins/emoticons/js/emojis.min.js</path>
             <word>Enterprise</word>
         </item>
         <item>
-            <path>lib/web/tiny_mce_7/plugins/emoticons/js/emojis.js</path>
+            <path>lib/web/tiny_mce_6/plugins/emoticons/js/emojis.js</path>
             <word>Enterprise</word>
         </item>
         <item>
-            <path>lib/web/tiny_mce_7/plugins/emoticons/js/emojiimages.min.js</path>
+            <path>lib/web/tiny_mce_6/plugins/emoticons/js/emojiimages.min.js</path>
             <word>Enterprise</word>
         </item>
         <item>
-            <path>lib/web/tiny_mce_7/plugins/emoticons/js/emojiimages.js</path>
+            <path>lib/web/tiny_mce_6/plugins/emoticons/js/emojiimages.js</path>
             <word>Enterprise</word>
         </item>
         <item>

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
@@ -231,6 +231,8 @@ define([
 
                     return content;
                 });
+
+                return this.widget;
             };
 
         /**

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
@@ -253,6 +253,8 @@ define([
                 varienGlobalEvents.attachEventHandler('wysiwygClosePopups', function () {
                     wysiwyg.closeEditorPopup('widget_window' + wysiwyg.getId());
                 });
+
+                return this.widget;
             };
 
         // Register plugin

diff --git a/lib/web/tiny_mce_6/icons/default/icons.min.js b/lib/web/tiny_mce_6/icons/default/icons.min.js
diff --git a/lib/web/tiny_mce_7/langs/README.md → lib/web/tiny_mce_6/langs/README.md b/lib/web/tiny_mce_7/langs/README.md → lib/web/tiny_mce_6/langs/README.md
diff --git a/lib/web/tiny_mce_6/license.txt b/lib/web/tiny_mce_6/license.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Ephox Corporation DBA Tiny Technologies, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/lib/web/tiny_mce_6/models/dom/model.min.js b/lib/web/tiny_mce_6/models/dom/model.min.js
diff --git a/lib/web/tiny_mce_6/plugins/accordion/plugin.min.js b/lib/web/tiny_mce_6/plugins/accordion/plugin.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -231,6 +231,8 @@ define([ @@
                         return content;
                     });
+                    return this.widget;
                 };
             /**
@@ Expand Down @@