Skip to content

Commit

Permalink
Merge forwardport of #12141 to 2.3-develop branch
Browse files Browse the repository at this point in the history
Applied pull request patch https://github.com/magento/magento2/pull/12141.patch (created by @vovayatsyuk) based on commit(s):
  1. 032316d
  2. 3b139c4
  • Loading branch information
magento-engcom-team committed Feb 9, 2018
2 parents a29b455 + d73cca2 commit bac46ce
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ define([
this.$wysiwygEditorButton = $(element);
}.bind(this));

// disable editor completely after initialization is field is disabled
varienGlobalEvents.attachEventHandler('wysiwygEditorInitialized', function () {
if (this.disabled()) {
this.setDisabled(true);
}
}.bind(this));

return this;
},

Expand Down Expand Up @@ -108,7 +101,6 @@ define([

/* eslint-disable no-undef */
if (typeof wysiwyg !== 'undefined' && wysiwyg.activeEditor()) {

if (wysiwyg && disabled) {
wysiwyg.setEnabledStatus(false);
wysiwyg.getPluginButtons().prop('disabled', 'disabled');
Expand Down

0 comments on commit bac46ce

Please sign in to comment.