Forwardport of #12141 to 2.3-develop branch

magento · Jan 24, 2018 · e9238bc · e9238bc
1 parent 8e77e2f
commit e9238bc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
@@ -45,7 +45,8 @@ define([
                 component: this,
                 selector: 'button'
             }, function (element) {
-                this.$wysiwygEditorButton = $(element);
+                this.$wysiwygEditorButton = this.$wysiwygEditorButton ?
+                    this.$wysiwygEditorButton.add($(element)) : $(element);
             }.bind(this));
 
             return this;
@@ -94,7 +95,7 @@ define([
             this.$wysiwygEditorButton.attr('disabled', status);
 
             /* eslint-disable no-undef */
-            if (wysiwygAdapter) {
+            if (wysiwygAdapter && wysiwygAdapter.activeEditor()) {
                 _.each(wysiwygAdapter.activeEditor().controlManager.controls, function (property, index, controls) {
                     controls[property.id].setDisabled(status);
                 });