Skip to content

Commit baf829b

Browse files
Merge remote-tracking branch 'origin/Arrows-AC-14602' into Arrows-AC-14602
2 parents 597e991 + 04a27d3 commit baf829b

File tree

257 files changed

+119154
-1031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+119154
-1031
lines changed

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<element name="UploadImageNew" type="file" selector="#upload_image"/>
2424
<element name="UploadImageSelector" type="file" selector="#fileUploader"/>
2525
<element name="UploadImageWithUploaderId" type="file" selector="#fileUploader + .uppy-Root .uppy-Dashboard-input"/>
26-
<element name="OkBtn" type="button" selector=".tox-dialog__footer button[title='Save']"/>
26+
<element name="OkBtn" type="button" selector=".tox-dialog__footer button[@aria-label='Save']"/>
2727
<element name="insertBtn" type="button" selector="#insert"/>
2828
<element name="InsertFile" type="text" selector="#insert_files" timeout="30"/>
2929
<element name="CreateFolder" type="button" selector="#new_folder" timeout="30"/>

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/TinyMCESection.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@
1010
<section name="TinyMCESection">
1111
<element name="checkIfContentTabOpen" type="button" selector="//span[text()='Content']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
1212
<element name="CheckIfTabExpand" type="button" selector="//div[@data-state-collapsible='closed']//span[text()='Content']"/>
13-
<element name="TinyMCE" type="text" selector=".tox-tinymce"/>
13+
<element name="TinyMCE" type="text" selector=".tox-hugerte"/>
1414
<element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
15-
<element name="InsertWidgetIcon" type="button" selector="button[title='Insert Widget']" timeout="30"/>
15+
<element name="InsertWidgetIcon" type="button" selector="button[aria-label='Insert Widget']" timeout="30"/>
1616
<element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
17-
<element name="InsertVariableIcon" type="button" selector="button[title='Insert Variable']"/>
17+
<element name="InsertVariableIcon" type="button" selector="button[aria-label='Insert Variable']"/>
1818
<element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
19-
<element name="InsertImageIcon" type="button" selector="button[title='Insert/edit image']" timeout="30"/>
20-
<element name="Style" type="button" selector="button[title='Block Paragraph']"/>
21-
<element name="Bold" type="button" selector="button[title='Bold']"/>
22-
<element name="Italic" type="button" selector="button[title='Italic']"/>
23-
<element name="Underline" type="button" selector="button[title='Underline']"/>
24-
<element name="AlignLeft" type="button" selector="button[title='Align left']"/>
25-
<element name="AlignCenter" type="button" selector="button[title='Align center']"/>
26-
<element name="AlignRight" type="button" selector="button[title='Align right']"/>
27-
<element name="Bullet" type="button" selector="div[title='Bullet list']"/>
28-
<element name="Numlist" type="button" selector="div[title='Numbered list']"/>
29-
<element name="InsertLink" type="button" selector="button[title='Insert/edit link']"/>
30-
<element name="InsertTable" type="button" selector="button[title='Table']"/>
31-
<element name="SpecialCharacter" type="button" selector="button[title='Special character']"/>
19+
<element name="InsertImageIcon" type="button" selector="button[aria-label='Insert/edit image']" timeout="30"/>
20+
<element name="Style" type="button" selector="button[aria-label='Block Paragraph']"/>
21+
<element name="Bold" type="button" selector="button[aria-label='Bold']"/>
22+
<element name="Italic" type="button" selector="button[aria-label='Italic']"/>
23+
<element name="Underline" type="button" selector="button[aria-label='Underline']"/>
24+
<element name="AlignLeft" type="button" selector="button[aria-label='Align left']"/>
25+
<element name="AlignCenter" type="button" selector="button[aria-label='Align center']"/>
26+
<element name="AlignRight" type="button" selector="button[aria-label='Align right']"/>
27+
<element name="Bullet" type="button" selector="div[aria-label='Bullet list']"/>
28+
<element name="Numlist" type="button" selector="div[aria-label='Numbered list']"/>
29+
<element name="InsertLink" type="button" selector="button[aria-label='Insert/edit link']"/>
30+
<element name="InsertTable" type="button" selector="button[aria-label='Table']"/>
31+
<element name="SpecialCharacter" type="button" selector="button[aria-label='Special character']"/>
3232
<element name="WidgetButton" type="button" selector="span[class*='magento-widget mceNonEditable']"/>
3333
<element name="EditorContent" type="input" selector="#tinymce"/>
3434
<element name="Content" type="textarea" selector="textarea"/>

app/code/Magento/Cms/etc/adminhtml/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<argument name="adapterOptions" xsi:type="array">
3939
<item name="tinymce" xsi:type="array">
4040
<item name="value" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</item>
41-
<item name="label" xsi:type="string" translatable="true">TinyMCE 6</item>
41+
<item name="label" xsi:type="string" translatable="true">Hugerte</item>
4242
</item>
4343
</argument>
4444
</arguments>

app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
4141
<conditionalClick selector="{{TinyMCESection.ShowHideBtn}}" dependentSelector="{{TinyMCESection.TinyMCE}}" visible="false" stepKey="toggleEditorIfHidden"/>
4242
<waitForPageLoad time="10" stepKey="waitForPageLoad21"/>
43-
<conditionalClick selector="#toggletext" dependentSelector=".tox-tinymce" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
43+
<conditionalClick selector="#toggletext" dependentSelector=".tox-hugerte" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
4444
<waitForElementVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="waitForTinyMCE"/>
4545
<executeJS function="tinyMCE.get('text').setContent('Hello World From Newsletter Template!');" stepKey="executeJSFillContent"/>
4646
<seeElement selector="{{TinyMCESection.InsertVariableIcon}}" stepKey="seeInsertVariableIcon" />

app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEIsNativeWYSIWYGOnNewsletterTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
3030
<fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
3131
<fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
32-
<conditionalClick selector="#toggletext" dependentSelector=".tox-tinymce" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
32+
<conditionalClick selector="#toggletext" dependentSelector=".tox-hugerte" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
3333
<waitForPageLoad stepKey="waitForTinyMce"/>
3434
<actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE"/>
3535
<actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>

app/code/Magento/Ui/view/base/requirejs-config.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ var config = {
88
shim: {
99
'chartjs/chartjs-adapter-moment': ['moment'],
1010
'chartjs/es6-shim.min': {},
11-
'tiny_mce_6/tinymce.min': {
12-
exports: 'tinyMCE'
11+
'hugerte/hugerte.min': {
12+
exports: 'hugerte',
13+
init: function() {
14+
window.tinymce = window.hugerte;
15+
return window.hugerte;
16+
}
1317
}
1418
},
1519
paths: {
@@ -28,7 +32,7 @@ var config = {
2832
buttonAdapter: 'Magento_Ui/js/form/button-adapter',
2933
chartJs: 'chartjs/Chart.min',
3034
'chart.js': 'chartjs/Chart.min',
31-
tinymce: 'tiny_mce_6/tinymce.min',
35+
'tinymce': 'hugerte/hugerte.min',
3236
wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter'
3337
}
3438
}

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,13 @@
4141
"colinmollenhour/credis": "^1.15",
4242
"colinmollenhour/php-redis-session-abstract": "^2.0",
4343
"composer/composer": "^2.0, !=2.2.16",
44-
"elasticsearch/elasticsearch": "^8.15",
4544
"duosecurity/duo_api_php": "^1.1",
4645
"duosecurity/duo_universal_php": "^1.0",
46+
"elasticsearch/elasticsearch": "^8.15",
4747
"ezyang/htmlpurifier": "^4.17",
4848
"guzzlehttp/guzzle": "^7.5",
4949
"laminas/laminas-captcha": "^2.18",
5050
"laminas/laminas-code": "^4.13",
51-
"magento/magento-zf-db": "^3.21",
5251
"laminas/laminas-di": "^3.15",
5352
"laminas/laminas-escaper": "^2.13",
5453
"laminas/laminas-eventmanager": "^3.11",
@@ -69,6 +68,7 @@
6968
"magento/composer": "^1.10.1-beta1",
7069
"magento/composer-dependency-version-audit-plugin": "^0.1",
7170
"magento/magento-composer-installer": ">=0.4.0",
71+
"magento/magento-zf-db": "^3.21",
7272
"magento/zend-cache": "^1.16",
7373
"magento/zend-db": "^1.16",
7474
"magento/zend-pdf": "^1.16",
@@ -82,10 +82,10 @@
8282
"ramsey/uuid": "^4.2",
8383
"symfony/console": "^6.4",
8484
"symfony/intl": "^6.4",
85-
"symfony/process": "^6.4",
86-
"symfony/string": "^6.4",
8785
"symfony/mailer": "^6.4",
8886
"symfony/mime": "^6.4",
87+
"symfony/process": "^6.4",
88+
"symfony/string": "^6.4",
8989
"tedivm/jshrink": "^1.4",
9090
"tubalmartin/cssmin": "^4.1",
9191
"web-token/jwt-framework": "^3.4",

lib/web/hugerte/CHANGELOG.md

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
6+
and is generated by [Changie](https://github.com/miniscruff/changie).
7+
8+
## 1.0.4 - 2024-10-28
9+
10+
### Added
11+
- Copyright and license info has been added to the build header. #GH-27
12+
13+
### Fixed
14+
- The used dompurify version has been upgraded, fixing the issue that invalid HTML elements within an `svg` element weren't removed. #GH-26
15+
16+
## 1.0.3 - 2024-10-04
17+
18+
### Improved
19+
- Updated references to bad HugeRTE 1.0.0 build in README.md #GH-23
20+
21+
## 1.0.2 - 2024-10-04
22+
23+
### Fixed
24+
- The license field in composer.json was set to MIT-only instead of MIT. The `-only` prefix makes sense for GPL licenses but not MIT.
25+
26+
## 1.0.1 - 2024-10-04
27+
28+
### Improved
29+
- The package.json and composer.json files now include better metadata.
30+
31+
### Fixed
32+
- Wrong files were published at npm. #GH-23
33+
34+
## 1.0.0 - 2024-10-01
35+
36+
### Added
37+
- New custom tooltip functionality, tooltip will be shown when hovering with a mouse or with keyboard focus. #TINY-9275
38+
- New `sandbox_iframes_exclusions` option that holds a list of URL host names to be excluded from iframe sandboxing when `sandbox_iframes` is set to `true`. #TINY-10350
39+
- Added 'getAllEmojis' api function to the emoticons plugin #TINY-10572
40+
- Element preset support for the `valid_children` option and Schema.addValidChildren API. #TINY-9979
41+
- A new `trigger` property for block text pattern configurations, allowing pattern activation with either Space or Enter keys. #TINY-10324
42+
- Added onFocus callback for CustomEditor dialog component. #TINY-10596
43+
- Added icons for the import from Word, export to Word and export to PDF premium plugins. #TINY-10612
44+
- Added `data` to Schema as a valid element. #TINY-10611
45+
- More advanced schema config for custom elements. #TINY-9980
46+
- Added custom tooltip for autocompleter, now visible on both mouse hover and keyboard focus, except single column cases. #TINY-9638
47+
- Added importword, exportpdf and exportword menu items to default file menu. #TINY-10670
48+
49+
### Improved
50+
- Included keyboard shortcut in custom tooltip for `ToolbarButton` and `ToolbarToggleButton`. #TINY-10487
51+
- Improved showing which element has focus for keyboard navigation. #TINY-9176
52+
- Custom tooltips will now show for items in `collection` which is rendered inside a dialog, on mouse hover and keyboard focus. #TINY-9637
53+
- Autocompleter will now work with IMEs. #TINY-10637
54+
- Make table ghost element better reflect height changes when resizing. #TINY-10658
55+
56+
### Changed
57+
- `convert_unsafe_embeds` editor option is now defaulted to `true`. #TINY-10351
58+
- `sandbox_iframes` editor option is now defaulted to `true`. #TINY-10350
59+
- The DOMUtils.isEmpty API function has been modified to consider nodes containing only comments as empty. #TINY-10459
60+
- The `highlight_on_focus` option now defaults to true, adding a focus outline to every editor. #TINY-10574
61+
- Delay before the tooltip to show up, from 800ms to 300ms. #TINY-10475
62+
- Now `tox-view__pane` has `position: relative` instead of `static`. #TINY-10561
63+
- Update outbound link for statusbar Tiny logo #TINY-10494
64+
- Remove the height field from the `table` plugin cell dialog. The `table` plugin row dialog now controls the row height by setting the height on the `tr` element, not the `td` elements. #TINY-10617
65+
- Change table height resizing handling to remove heights from `td`/`th` elements and only apply to `tr` elements. #TINY-10589
66+
- Removed incorrect `aria-placeholder` attribute from editor body when `placeholder` option is set. #TINY-10452
67+
- The `tooltip` property for dialog's footer `togglebutton` is now optional. #TINY-10672
68+
- `TinyMCE`, `tinymce`, `Tinymce`, `TinyMce`, `tinyMCE`, `tinyMce` have been replaced by appropiate HugeRTE variants, especially the global `tinymce` object #GH-8
69+
70+
### Removed
71+
- Removed the deprecated `remove_trailing_brs` option from DomParser. #TINY-10454
72+
- Removed `title` attribute for buttons with visible label. #TINY-10453
73+
- Removed `InsertOrderedList` and `InsertUnorderedList` from core. #TINY-10644
74+
- Removed `closeButton` from `NotificationSpec`, close button in notification is now rendered by default. #TINY-10646
75+
- The autocompleter `ch` configuration property has been removed. Use the `trigger` property instead. #TINY-8929
76+
77+
### Fixed
78+
- When deleting the last row in a table, the cursor would jump to the first cell (top left), instead of moving to the next adjacent cell in some cases. #TINY-6309
79+
- Heading formatting would be partially applied to the content within the `summary` element when the caret was positioned between words. #TINY-10312
80+
- Moving focus to the outside of the editor after having clicked a menu would not fire a `blur` event as expected. #TINY-10310
81+
- Autocomplete would sometimes cause corrupt data when starting during text composition. #TINY-10317
82+
- Inline mode with persisted toolbar would show regardless of the skin being loaded, causing css issues #TINY-10482
83+
- Table classes couldn't be removed via setting an empty value in `table_class_list`. Also fixed being forced to pick the first class option. #TINY-6653
84+
- Directly right clicking on a ol's li in FireFox didn't enable the button `List Properties...` in the context menu. #TINY-10490
85+
- The `link_default_target` option wasn't considered when inserting a link via `quicklink` toolbar. #TINY-10439
86+
- When inline editor toolbar wrapped to multiple lines the top wasn't always calculated correctly. #TINY-10580
87+
- Removed manually dispatching dragend event on drop in Firefox. #TINY-10389
88+
- Slovenian help dialog content had a dot in the wrong place. #TINY-10601
89+
- Pressing Backspace at the start of an empty `summary` element within a `details` element nested in a list item no longer removes the `summary` element. #TINY-10303
90+
- The toolbar width was miscalculated for the inline editor positioned inside a scrollable container. #TINY-10581
91+
- Fixed incorrect object processor for `event_root` option. #TINY-10433
92+
- Adding newline after using `selection.setContent` to insert a block element would throw an unhandled exception. #TINY-10560
93+
- Floating toolbar buttons in inline editor incorrectly wrapped into multiple rows on window resizing or zooming. #TINY-10570
94+
- When setting table border width and `table_style_by_css` is true, only the border attribute is set to 0 and border-width styling is no longer used #TINY-10308
95+

0 commit comments

Comments
 (0)