Skip to content

Commit 28f7650

Browse files
xmavxmav
authored
Merge pull request #306 from magento-trigger/AC-282
AC-282: Add tinymce4 to Legacy static test
2 parents dd7435c + 08da0b9 commit 28f7650

File tree

4 files changed

+122
-3
lines changed

4 files changed

+122
-3
lines changed

‎app/code/Magento/Cms/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ The CMS module provides the create, edit, and manage functionality on pages for
66

77
### Wysiwyg
88

9-
The Wysiwyg UI component is a customizable and configurable TinyMCE4 editor.
9+
The Wysiwyg UI component is a customizable and configurable TinyMCE editor.
1010

1111
The default implementation has the following customizations:
1212

13-
* Magento Media Library support
13+
* Magento Media Library support

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"extends": [
33
"./.eslintrc-reset",
44
"./.eslintrc-magento",
5-
"./.eslintrc-jquery"
5+
"./.eslintrc-jquery",
6+
"./.eslintrc-tinymce"
67
]
78
}

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

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{
2+
"rules": {
3+
'no-restricted-syntax': [
4+
'error',
5+
{
6+
message: "addCommand is removed. Update code to be compatible with tinymce5",
7+
selector: "CallExpression[callee.object.name='editor'][callee.property.name='addCommand']"
8+
},
9+
{
10+
message: "addButton is removed. Update code to be compatible with tinymce5",
11+
selector: "CallExpression[callee.object.name='editor'][callee.property.name='addButton']"
12+
},
13+
{
14+
message: "addContextToolbar is removed. Update code to be compatible with tinymce5",
15+
selector: "CallExpression[callee.object.name='editor'][callee.property.name='addContextToolbar']"
16+
},
17+
{
18+
message: "addMenuItem is removed. Update code to be compatible with tinymce5",
19+
selector: "CallExpression[callee.object.name='editor'][callee.property.name='addMenuItem']"
20+
},
21+
{
22+
message: "addSidebar is removed. Update code to be compatible with tinymce5",
23+
selector: "CallExpression[callee.object.name='editor'][callee.property.name='addSidebar']"
24+
},
25+
{
26+
message: "file_browser_callback is removed. Update code to be compatible with tinymce5",
27+
selector: "MemberExpression[property.value='file_browser_callback']"
28+
},
29+
{
30+
message: "file_browser_callback is removed. Update code to be compatible with tinymce5",
31+
selector: "MemberExpression[property.name='file_browser_callback']"
32+
},
33+
{
34+
message: "file_browser_callback is removed. Update code to be compatible with tinymce5",
35+
selector: "ObjectExpression > Property > Identifier[name='file_browser_callback']"
36+
},
37+
{
38+
message: "insert_button_items is removed. Update code to be compatible with tinymce5",
39+
selector: "MemberExpression[property.value='insert_button_items']"
40+
},
41+
{
42+
message: "insert_button_items is removed. Update code to be compatible with tinymce5",
43+
selector: "MemberExpression[property.name='insert_button_items']"
44+
},
45+
{
46+
message: "insert_button_items is removed. Update code to be compatible with tinymce5",
47+
selector: "ObjectExpression > Property > Identifier[name='insert_button_items']"
48+
},
49+
{
50+
message: "'modern' theme is removed. Update code to be compatible with tinymce5",
51+
selector: "AssignmentExpression[left.property.value='theme'][right.value='modern']"
52+
},
53+
{
54+
message: "'modern' theme is removed. Update code to be compatible with tinymce5",
55+
selector: "AssignmentExpression[left.property.name='theme'][right.value='modern']"
56+
},
57+
{
58+
message: "'modern' theme is removed. Update code to be compatible with tinymce5",
59+
selector: "ObjectExpression > Property[key.name='theme'][value.value='modern']"
60+
},
61+
{
62+
message: "'inlite' theme is removed. Update code to be compatible with tinymce5",
63+
selector: "AssignmentExpression[left.property.value='theme'][right.value='inlite']"
64+
},
65+
{
66+
message: "'inlite' theme is removed. Update code to be compatible with tinymce5",
67+
selector: "AssignmentExpression[left.property.name='theme'][right.value='inlite']"
68+
},
69+
{
70+
message: "'inlite' theme is removed. Update code to be compatible with tinymce5",
71+
selector: "ObjectExpression > Property[key.name='theme'][value.value='inlite']"
72+
},
73+
{
74+
message: "'mobile' theme is removed. Update code to be compatible with tinymce5",
75+
selector: "AssignmentExpression[left.property.value='theme'][right.value='mobile']"
76+
},
77+
{
78+
message: "'mobile' theme is removed. Update code to be compatible with tinymce5",
79+
selector: "AssignmentExpression[left.property.name='theme'][right.value='mobile']"
80+
},
81+
{
82+
message: "'mobile' theme is removed. Update code to be compatible with tinymce5",
83+
selector: "ObjectExpression > Property[key.name='theme'][value.value='mobile']"
84+
},
85+
]
86+
}
87+
}

‎dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<word>secure_base_url}}skin/</word>
2424
<word>secure_base_url}}media/</word>
2525
<word>head.js</word>
26+
<word>tinymce4</word>
2627
<!-- typos -->
2728
<word>overriden</word>
2829
<word>retrive</word>
@@ -73,5 +74,35 @@
7374
<path>app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less</path>
7475
<word>rma</word>
7576
</item>
77+
<item>
78+
<path>lib/web/tiny_mce_5/plugins/help/plugin.min.js</path>
79+
<word>CHANGELOG</word>
80+
</item>
81+
<item>
82+
<path>lib/web/tiny_mce_5/plugins/emoticons/js/emojis.min.js</path>
83+
<word>Enterprise</word>
84+
</item>
85+
<item>
86+
<path>lib/web/tiny_mce_5/plugins/emoticons/js/emojis.js</path>
87+
<word>Enterprise</word>
88+
</item>
89+
<item>
90+
<path>lib/web/tiny_mce_5/plugins/emoticons/js/emojiimages.min.js</path>
91+
<word>Enterprise</word>
92+
</item>
93+
<item>
94+
<path>lib/web/tiny_mce_5/plugins/emoticons/js/emojiimages.js</path>
95+
<word>Enterprise</word>
96+
</item>
97+
<item>
98+
<component type="module" name="Magento_Config" />
99+
<path>Setup/Patch/Data/UnsetTinymce3.php</path>
100+
<word>tinymce4</word>
101+
</item>
102+
<item>
103+
<component type="module" name="Magento_Config" />
104+
<path>Setup/Patch/Data/RemoveTinymceConfig.php</path>
105+
<word>tinymce4</word>
106+
</item>
76107
</whitelist>
77108
</config>

0 commit comments

Comments
 (0)