Merge remote-tracking branch 'origin/MC-3918' into cms-team-1-delivery

Author: cspruiell

app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js

@@ -37,7 +37,15 @@ define([
             this.config = config;
             this.schema = config.schema || html5Schema;
 
-            _.bindAll(this, 'beforeSetContent', 'saveContent', 'onChangeContent', 'openFileBrowser', 'updateTextArea');
+            _.bindAll(
+                this,
+                'beforeSetContent',
+                'saveContent',
+                'onChangeContent',
+                'openFileBrowser',
+                'updateTextArea',
+                'removeEvents'
+            );
 
             varienGlobalEvents.attachEventHandler('tinymceChange', this.onChangeContent);
             varienGlobalEvents.attachEventHandler('tinymceBeforeSetContent', this.beforeSetContent);
@@ -72,6 +80,17 @@ define([
             tinyMCE3.init(this.getSettings(mode));
         },
 
+        /**
+         * Remove events from instance.
+         *
+         * @param {String} wysiwygId
+         */
+        removeEvents: function (wysiwygId) {
+            var editor = tinyMceEditors.get(wysiwygId);
+
+            varienGlobalEvents.removeEventHandler('tinymceChange', editor.onChangeContent);
+        },
+
         /**
          * @param {*} mode
          * @return {Object}

app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php

@@ -50,8 +50,9 @@ public function __construct(
     ) {
         $wysiwygConfigData = isset($config['wysiwygConfigData']) ? $config['wysiwygConfigData'] : [];
         $this->form = $formFactory->create();
+        $wysiwygId = $context->getNamespace() . '_' . $data['name'];
         $this->editor = $this->form->addField(
-            $context->getNamespace() . '_' . $data['name'],
+            $wysiwygId,
             \Magento\Framework\Data\Form\Element\Editor::class,
             [
                 'force_load' => true,
@@ -62,6 +63,7 @@ public function __construct(
             ]
         );
         $data['config']['content'] = $this->editor->getElementHtml();
+        $data['config']['wysiwygId'] = $wysiwygId;
 
         parent::__construct($context, $components, $data);
     }

app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js

@@ -61,6 +61,14 @@ define([
             return this;
         },
 
+        /**
+         * @inheritdoc
+         */
+        destroy: function () {
+            this._super();
+            wysiwyg.removeEvents(this.wysiwygId);
+        },
+
         /**
          *
          * @returns {exports}

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js

@@ -40,7 +40,8 @@ define([
                 'onChangeContent',
                 'openFileBrowser',
                 'updateTextArea',
-                'onUndo'
+                'onUndo',
+                'removeEvents'
             );
 
             varienGlobalEvents.attachEventHandler('tinymceChange', this.onChangeContent);
@@ -110,7 +111,7 @@ define([
                     tinyMCE4.ui.FloatPanel.zIndex = settings.toolbarZIndex;
                 }
 
-                varienGlobalEvents.removeEventHandler('tinymceChange', this.onChangeContent);
+                this.removeEvents(self.id);
             }
 
             jQuery.when.apply(jQuery, deferreds).done(function () {
@@ -120,6 +121,17 @@ define([
             }.bind(this));
         },
 
+        /**
+         * Remove events from instance.
+         *
+         * @param {String} wysiwygId
+         */
+        removeEvents: function (wysiwygId) {
+            var editor = tinyMceEditors.get(wysiwygId);
+
+            varienGlobalEvents.removeEventHandler('tinymceChange', editor.onChangeContent);
+        },
+
         /**
          * Add plugin to the toolbar if not added.
          *