Skip to content

Commit 8801961

Browse files
authored
Merge branch '2.4-develop' into Philippines-locale-validation-issue
2 parents 22b5f38 + f0f779a commit 8801961

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ define([
137137
if (this.$wysiwygEditorButton && disabled) {
138138
this.$wysiwygEditorButton.prop('disabled', 'disabled');
139139
} else if (this.$wysiwygEditorButton) {
140-
this.$wysiwygEditorButton.removeProp('disabled');
140+
this.$wysiwygEditorButton.prop('disabled', false);
141141
}
142142

143143
/* eslint-disable no-undef */

dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"./.eslintrc-reset",
44
"./.eslintrc-magento",
55
"./.eslintrc-jquery",
6-
"./.eslintrc-tinymce"
6+
"./.eslintrc-misc"
77
]
88
}

dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc-tinymce renamed to dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc-misc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@
7878
message: "'mobile' theme is removed. Update code to be compatible with tinymce5",
7979
selector: "ObjectExpression > Property[key.name='theme'][value.value='mobile']"
8080
},
81+
{
82+
message: "This method should not be used to remove built-in (native) properties",
83+
selector: "CallExpression[callee.property.name='removeProp'] > :matches([arguments] Literal[value='disabled'], Literal[value='checked'], Literal[value='selected'], Literal[value='required'], Literal[value='value'], Literal[value='readOnly'])"
84+
}
8185
]
8286
}
8387
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ define([
644644
}
645645

646646
if (enabled) {
647-
this.getTextArea().removeProp('disabled');
647+
this.getTextArea().prop('disabled', false);
648648
} else {
649649
this.getTextArea().prop('disabled', 'disabled');
650650
}

0 commit comments

Comments
 (0)