Skip to content

Commit dd1f838

Browse files
glo71317glo71317
authored
Merge pull request #445 from magento-gl/Arrows-AC-14602
AC-14602::Migrate from TinyMCE to Hugerte.org
2 parents a56944d + b1656e6 commit dd1f838

File tree

18 files changed

+67
-67
lines changed

18 files changed

+67
-67
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<element name="panelFieldTooltipWithUploaderId" type="button" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@upload-area-id='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::a[contains(@class,'admin__field-tooltip-action')]"/>
4040
<element name="panelFieldTooltipContent" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-tooltip-content')]"/>
4141
<element name="panelFieldTooltipContentWithUploaderId" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@upload-area-id='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-tooltip-content')]"/>
42-
<element name="panelFieldValidationError" type="input" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}' and contains(@class,'_error')]//div[contains(@class,'')]//*[@name='{{arg2}}' or contains(@class,'tox-tinymce')][last()]" parameterized="true"/>
43-
<element name="panelFieldValidationErrorMessage" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//*[@name='{{arg2}}' or contains(@class,'tox-tinymce')][last()]//..//..//..//label[.='{{arg3}}']" parameterized="true"/>
42+
<element name="panelFieldValidationError" type="input" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}' and contains(@class,'_error')]//div[contains(@class,'')]//*[@name='{{arg2}}' or contains(@class,'tox-hugerte')][last()]" parameterized="true"/>
43+
<element name="panelFieldValidationErrorMessage" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//*[@name='{{arg2}}' or contains(@class,'tox-hugerte')][last()]//..//..//..//label[.='{{arg3}}']" parameterized="true"/>
4444
<element name="panelMultiSelectFieldControl" type="input" selector="aside [data-index='{{arg1}}'] [data-index='{{arg2}}'] [data-role='advanced-select']" parameterized="true"/>
4545
<element name="panelMultiSelectFieldControlInput" type="input" selector="aside [data-index='{{arg1}}'] [data-index='{{arg2}}'] .admin__action-multiselect-search" parameterized="true"/>
4646
<element name="panelMultiSelectFieldControlResult" type="input" selector="//aside//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}']//div[contains(@class,'action-menu-item')]//span[.='{{arg3}}']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<element name="onHoverUploadImageButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//label[text()='Upload Image']" parameterized="true"/>
5353
<element name="onHoverSelectFromGalleryButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']" parameterized="true"/>
5454
<element name="inlineWYSIWYGEditor" type="text" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'inline-wysiwyg')]|(//div[@data-content-type='{{arg1}}' and contains(@class,'inline-wysiwyg')])[{{arg2}}]" parameterized="true"/>
55-
<element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'tox-tinymce-inline')]|(//div[@data-content-type='{{arg1}}'])[{{arg2}}][following-sibling::div[contains(@class,'tox-tinymce-inline')]]" parameterized="true"/>
55+
<element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'tox-hugerte-inline')]|(//div[@data-content-type='{{arg1}}'])[{{arg2}}][following-sibling::div[contains(@class,'tox-hugerte-inline')]]" parameterized="true"/>
5656
<element name="inlineTextAreaEditor" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//textarea[@class='inline-wysiwyg-textarea']" parameterized="true"/>
5757
<element name="rootContainer" type="text" selector="(//div[contains(@class,&quot;pagebuilder-content-type&quot;) and contains(@class,&quot;pagebuilder-root-container&quot;)])[{{index}}]" parameterized="true"/>
5858
<element name="rootContainerPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-root-container')])[{{index}}][contains(@class,'empty-container')]//div[contains(@class,'empty-placeholder')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
3939
<element name="wysiwyg" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]" parameterized="true"/>
4040
<element name="contentJS" type="text" selector="document.querySelectorAll('div[data-content-type=text] .inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
41-
<element name="headingsList" type="text" selector="div[title='Headings']"/>
42-
<element name="heading1Style" type="text" selector="div[title='Heading 1']"/>
41+
<element name="headingsList" type="text" selector="//div[contains(@aria-label,'Headings')]"/>
42+
<element name="heading1Style" type="text" selector="//div[contains(@aria-label,'Heading 1')]"/>
4343
<element name="emptyTextInHeading1Style" selector="(//div[contains(@class,'pagebuilder-text')])[1]//h1" type="text" />
4444
<!-- Advanced Configuration -->
4545
<element name="advancedConfigurationPath" type="text" parameterized="true" selector="(//div[contains(@class,&quot;pagebuilder-text&quot;)])[{{arg1}}]/div[@data-pb-style]"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<element name="title" type="input" selector="//div[@aria-label='Insert link']//div[contains(@id,'-title') and .='Insert link']"/>
1313
<element name="xButton" type="button" selector="[aria-label='Insert link'] button.mce-close"/>
1414
<element name="urlInput" type="input" selector="//div[@class='tox-dialog']//label[text()='URL']/..//input"/>
15-
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@title='Browse links']"/>
15+
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@aria-label='Browse links']"/>
1616
<element name="textToDisplayInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Text to display']/..//input"/>
1717
<element name="titleInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Title']/..//input"/>
1818
<element name="targetInput" type="input" selector="button[title='Open link in...']"/>
19-
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@title='Save']"/>
19+
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@aria-label='Save']"/>
2020
<element name="cancelButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Cancel']"/>
2121
</section>
2222
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="WYSIWYGOnPageBuilderInline">
11-
<element name="toolbar" type="button" selector=".tox-tinymce.tox-tinymce-inline"/>
12-
<element name="inlineCss" type="button" selector=".tox-tinymce.tox-tinymce-inline"/>
13-
<element name="notCss" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline)"/>
14-
<element name="undo" type="button" selector=".tox-tinymce-inline button[aria-label='Undo']"/>
15-
<element name="redo" type="button" selector=".tox-tinymce-inline button[aria-label='Redo']"/>
16-
<element name="formatSelector" type="button" selector=".tox-tinymce-inline button[aria-label='Format Paragraph']"/>
17-
<element name="fontSize" type="button" selector=".tox-tinymce-inline button[aria-label*='font size']:nth-of-type(1)"/>
18-
<element name="fontSizeMinus" type="button" selector=".tox-tinymce-inline button[aria-label*='font size']:nth-of-type(1)"/>
19-
<element name="fontSizePlus" type="button" selector=".tox-tinymce-inline button[aria-label*='font size']:nth-of-type(2)"/>
20-
<element name="lineHeight" type="button" selector=".tox-tinymce-inline button[aria-label='Line height']"/>
21-
<element name="textColor" type="button" selector=".tox-tinymce-inline div[aria-label='Text color Black']"/>
22-
<element name="backgroundColor" type="button" selector=".tox-tinymce-inline div[aria-label='Background color Black']"/>
23-
<element name="bold" type="button" selector=".tox-tinymce-inline button[aria-label='Bold']"/>
24-
<element name="italic" type="button" selector=".tox-tinymce-inline button[aria-label='Italic']"/>
25-
<element name="underline" type="button" selector=".tox-tinymce-inline button[aria-label='Underline']"/>
26-
<element name="alignLeft" type="button" selector=".tox-tinymce-inline button[aria-label='Align left']"/>
27-
<element name="alignCenter" type="button" selector=".tox-tinymce-inline button[aria-label='Align center']"/>
28-
<element name="alignRight" type="button" selector=".tox-tinymce-inline button[aria-label='Align right']"/>
29-
<element name="numberedList" type="button" selector=".tox-tinymce-inline div[aria-label='Numbered list']"/>
30-
<element name="bulletList" type="button" selector=".tox-tinymce-inline div[aria-label='Bullet list']"/>
31-
<element name="insertLink" type="button" selector=".tox-tinymce-inline button[aria-label='Insert/edit link']"/>
32-
<element name="imageSelector" type="button" selector=".tox-tinymce-inline button[aria-label='Insert/edit image']"/>
33-
<element name="table" type="button" selector=".tox-tinymce-inline button[aria-label='Table']"/>
11+
<element name="toolbar" type="button" selector=".tox-hugerte.tox-hugerte-inline"/>
12+
<element name="inlineCss" type="button" selector=".tox-hugerte.tox-hugerte-inline"/>
13+
<element name="notCss" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline)"/>
14+
<element name="undo" type="button" selector=".tox-hugerte-inline button[aria-label='Undo']"/>
15+
<element name="redo" type="button" selector=".tox-hugerte-inline button[aria-label='Redo']"/>
16+
<element name="formatSelector" type="button" selector=".tox-hugerte-inline button[aria-label='Format Paragraph']"/>
17+
<element name="fontSize" type="button" selector=".tox-hugerte-inline button[aria-label*='font size']:nth-of-type(1)"/>
18+
<element name="fontSizeMinus" type="button" selector=".tox-hugerte-inline button[aria-label*='font size']:nth-of-type(1)"/>
19+
<element name="fontSizePlus" type="button" selector=".tox-hugerte-inline button[aria-label*='font size']:nth-of-type(2)"/>
20+
<element name="lineHeight" type="button" selector=".tox-hugerte-inline button[aria-label='Line height']"/>
21+
<element name="textColor" type="button" selector=".tox-hugerte-inline div[aria-label='Text color Black']"/>
22+
<element name="backgroundColor" type="button" selector=".tox-hugerte-inline div[aria-label='Background color Black']"/>
23+
<element name="bold" type="button" selector=".tox-hugerte-inline button[aria-label='Bold']"/>
24+
<element name="italic" type="button" selector=".tox-hugerte-inline button[aria-label='Italic']"/>
25+
<element name="underline" type="button" selector=".tox-hugerte-inline button[aria-label='Underline']"/>
26+
<element name="alignLeft" type="button" selector=".tox-hugerte-inline button[aria-label='Align left']"/>
27+
<element name="alignCenter" type="button" selector=".tox-hugerte-inline button[aria-label='Align center']"/>
28+
<element name="alignRight" type="button" selector=".tox-hugerte-inline button[aria-label='Align right']"/>
29+
<element name="numberedList" type="button" selector=".tox-hugerte-inline div[aria-label='Numbered list']"/>
30+
<element name="bulletList" type="button" selector=".tox-hugerte-inline div[aria-label='Bullet list']"/>
31+
<element name="insertLink" type="button" selector=".tox-hugerte-inline button[aria-label='Insert/edit link']"/>
32+
<element name="imageSelector" type="button" selector=".tox-hugerte-inline button[aria-label='Insert/edit image']"/>
33+
<element name="table" type="button" selector=".tox-hugerte-inline button[aria-label='Table']"/>
3434
<element name="tableMenuFirstItem" type="text" selector="div[title='Table']"/>
3535
<element name="tableGrid" type="text" parameterized="true" selector="//div[@class='tox-insert-table-picker']//div[{{size}}]"/>
3636
<element name="fontSizeValue" type="text" parameterized="true" selector="//*[@data-mce-style and contains(@style, '{{size}}')]"/>
@@ -43,12 +43,12 @@
4343
<element name="insertColumnBefore" type="button" selector="button[aria-label='Insert column before']"/>
4444
<element name="insertColumnAfter" type="button" selector="button[aria-label='Insert column after']"/>
4545
<element name="deleteColumn" type="button" selector="button[aria-label='Delete column']"/>
46-
<element name="specialCharacter" type="button" selector=".tox-tinymce-inline button[aria-label='Special character']"/>
47-
<element name="insertWidget" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Widget']"/>
48-
<element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
49-
<element name="imageSelectorBrowse" type="button" selector="button[title='Browse files']"/>
46+
<element name="specialCharacter" type="button" selector=".tox-hugerte-inline button[aria-label='Special character']"/>
47+
<element name="insertWidget" type="button" selector=".tox-hugerte-inline button[aria-label='Insert Widget']"/>
48+
<element name="insertVariable" type="button" selector=".tox-hugerte-inline button[aria-label='Insert Variable']"/>
49+
<element name="imageSelectorBrowse" type="button" selector="button[aria-label='Browse files']"/>
5050
<element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
51-
<element name="formatOption" type="text" parameterized="true" selector="div[title='{{label}}']"/>
52-
<element name="HeadSelector" type="text" selector="div[title='Headings']"/>
51+
<element name="formatOption" type="text" parameterized="true" selector="//div[contains(@aria-label,'{{label}}')]"/>
52+
<element name="HeadSelector" type="text" selector="//div[contains(@aria-label,'Headings')]"/>
5353
</section>
5454
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderSection.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="WYSIWYGOnPageBuilder">
12-
<element name="undo" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Undo']"/>
13-
<element name="redo" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Redo']"/>
14-
<element name="fontSize" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label*='font size']:nth-of-type(1)"/>
15-
<element name="lineHeight" type="button" selector=".mce-tinymce:not(.mce-tinymce-inline) div[aria-label='Line Height']"/>
16-
<element name="textColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Text color Black']"/>
17-
<element name="backgroundColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Background color Black']"/>
18-
<element name="formatSelector" type="button" selector="//div[contains(@class, 'tox-tinymce') and not(contains(@class, 'tox-tinymce-inline'))]//span[text()='Paragraph']"/>
12+
<element name="undo" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) button[aria-label='Undo']"/>
13+
<element name="redo" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) button[aria-label='Redo']"/>
14+
<element name="fontSize" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) button[aria-label*='font size']:nth-of-type(1)"/>
15+
<element name="lineHeight" type="button" selector=".mce-hugerte:not(.mce-hugerte-inline) div[aria-label='Line Height']"/>
16+
<element name="textColor" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) div[aria-label='Text color Black']"/>
17+
<element name="backgroundColor" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) div[aria-label='Background color Black']"/>
18+
<element name="formatSelector" type="button" selector="//div[contains(@class, 'tox-hugerte') and not(contains(@class, 'tox-hugerte-inline'))]//span[text()='Paragraph']"/>
1919
</section>
2020
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="TinyMCESection">
11-
<element name="Style" type="button" selector="button[title='Format Paragraph']"/>
11+
<element name="Style" type="button" selector="button[aria-label='Format Paragraph']"/>
1212
</section>
1313
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithCustomTinyMCETest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<seeElement selector="{{WYSIWYGOnPageBuilder.backgroundColor}}" stepKey="seeBackgroundColor"/>
5555

5656
<!--Verify FontStyle on preview-->
57-
<executeJS function="tinyMCE.get('pagebuilder_text_form_content').setContent('{{PageBuilderTextContentTypeDefault.value}}');" stepKey="executeJSFillContent"/>
57+
<executeJS function="hugerte.get('pagebuilder_text_form_content').setContent('{{PageBuilderTextContentTypeDefault.value}}');" stepKey="executeJSFillContent"/>
5858
<click selector="{{WYSIWYGOnPageBuilder.formatSelector}}" stepKey="expandFormatList"/>
5959
<see userInput="Headings" stepKey="seeHeadingsStyle"/>
6060
<click selector="{{TextOnStage.headingsList}}" stepKey="selectHeadingsList"/>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
.textarea {
3636
.error-border(@field-error-control__border-color);
3737
}
38-
.tox-tinymce {
38+
.tox-hugerte {
3939
.error-border(@field-error-control__border-color);
4040
}
4141
}

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_inline-wysiwyg.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
min-height: 20px;
2828
vertical-align: baseline;
2929
}
30-
~ .tox-tinymce-inline {
30+
~ .tox-hugerte-inline {
3131
display: block !important;
3232
height: auto !important;
3333
opacity: 0;
@@ -41,13 +41,13 @@
4141

4242
&.mce-edit-focus {
4343
outline: none;
44-
~ .tox-tinymce-inline {
44+
~ .tox-hugerte-inline {
4545
opacity: 1;
4646
pointer-events: all;
4747
visibility: visible !important;
4848
}
4949
}
50-
&._right-aligned-toolbar ~ div.tox-tinymce-inline {
50+
&._right-aligned-toolbar ~ div.tox-hugerte-inline {
5151
left: auto !important;
5252
}
5353
ul,
@@ -67,7 +67,7 @@
6767
}
6868
}
6969

70-
.tox-tinymce-aux {
70+
.tox-hugerte-aux {
7171
.tox-pop {
7272
max-width: none !important;
7373
min-width: 300px;

0 commit comments

Comments
 (0)