Skip to content

Commit 42a9e6e

Browse files
Merge pull request #119 from magento-trigger/AC-1445
[Trigger] AC-1445: Unable to click Underline in TinyMCE on PageBuilder
2 parents 60d2cbb + 6e02a1b commit 42a9e6e

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageAddContentDirectlyToStageTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
7777
</actionGroup>
7878
<!-- Verify Can Add HTML Code to Stage Directly -->
79+
<executeJS function="document.evaluate('{{PageBuilderStage.dropZone(PageBuilderRootContainerContentType.role, '1', '4')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.scrollIntoView();" stepKey="scrollToBottom"/>
7980
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragHTMLIntoContainer">
8081
<argument name="contentType" value="PageBuilderHtmlContentType"/>
8182
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
@@ -113,6 +114,7 @@
113114
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionAddContent">
114115
<argument name="contentType" value="PageBuilderBlockContentType"/>
115116
</actionGroup>
117+
<executeJS function="document.evaluate('{{PageBuilderStage.dropZone(PageBuilderRootContainerContentType.role, '1', '5')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.scrollIntoView();" stepKey="scrollToBottom2"/>
116118
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragBlockIntoContainer">
117119
<argument name="contentType" value="PageBuilderBlockContentType"/>
118120
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnsMoveContentBetweenColumnsTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,12 @@
7474
<argument name="contentTypeIndex" value="1"/>
7575
</actionGroup>
7676
<comment userInput="Add additional row and column group" stepKey="commentAddNewRowAndColumn"/>
77-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowIntoStage">
77+
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragRowIntoStage">
7878
<argument name="contentType" value="PageBuilderRowContentType"/>
79+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
80+
<argument name="dropZoneIndex" value="1"/>
81+
<argument name="offsetXCoordinate" value="1"/>
82+
<argument name="offsetYCoordinate" value="1"/>
7983
</actionGroup>
8084
<actionGroup ref="dragContentTypeToContainer" stepKey="dragColumnIntoNewRow">
8185
<argument name="contentType" value="PageBuilderColumnContentType"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/preview.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/modal/confirm-alert.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
define([
77
'jquery',
88
'jquery-ui-modules/widget',
9-
'Magento_Ui/js/modal/alert'
9+
'Magento_Ui/js/modal/alert',
10+
'jquery/z-index'
1011
], function ($) {
1112
'use strict';
1213

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/preview.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import "jarallax";
77
import "jarallaxVideo";
88
import $ from "jquery";
9+
import "jquery/z-index";
910
import $t from "mage/translate";
1011
import events from "Magento_PageBuilder/js/events";
1112
import mageUtils from "mageUtils";

0 commit comments

Comments
 (0)