Fix issues inserting Widgets with nested WYSIWYGs

This PR is a potential fix for issues magento#19742 and magento#13409 (Thanks to @EduardTd for pointing me in the right direction). I've tested this briefly in my own install and it appears to resolve the issue. Submitting this PR so that the issue can be tested fully.
molovo · Jan 10, 2019 · 3bcf0d8 · 3bcf0d8
1 parent d7ac52b
commit 3bcf0d8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/web/mage/adminhtml/wysiwyg/widget.js b/lib/web/mage/adminhtml/wysiwyg/widget.js
@@ -456,7 +456,7 @@ define([
                     parameters: params,
                     onComplete: function (transport) {
                         try {
-                            editor = wysiwyg.activeEditor();
+                            editor = tinyMCE.get(this.widgetTargetId);
 
                             widgetTools.onAjaxSuccess(transport);
                             widgetTools.dialogWindow.modal('closeModal');
@@ -469,7 +469,7 @@ define([
                                     editor.selection.select(activeNode);
                                     editor.selection.setContent(transport.responseText);
                                 } else if (this.bMark) {
-                                    wysiwyg.activeEditor().selection.moveToBookmark(this.bMark);
+                                    editor.selection.moveToBookmark(this.bMark);
                                 }
                             }
 
@@ -513,7 +513,7 @@ define([
          * @return {null|wysiwyg.Editor|*}
          */
         getWysiwyg: function () {
-            return wysiwyg.activeEditor();
+            return tinyMCE.get(this.widgetTargetId);
         },
 
         /**