Skip to content

Commit 4471d2c

Browse files
kieuphan2406kieuphan2406
committed
Merge remote-tracking branch 'origin/develop' into AC-103
2 parents aeabc53 + 09c4261 commit 4471d2c

File tree

55 files changed

+109
-96
lines changed

Some content is hidden

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

55 files changed

+109
-96
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStageSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="BlockOnStage">
11-
<element name="html" type="text" selector="((//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//div[contains(@data-bind,'html: data.main.html')])[{{arg2}}]//div[contains(@class,'placeholder-html-code')]" parameterized="true"/>
11+
<element name="html" type="text" selector="((//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//div[contains(@data-bind,'html: dataMainUnsanitizedHtml')])[{{arg2}}]//div[contains(@class,'placeholder-html-code')]" parameterized="true"/>
1212
<element name="allBlocks" type="text" selector="[data-content-type='block']"/>
1313
<element name="status" type="text" selector="((//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//span[contains(@class,'placeholder') and text()='{{arg}}'])" parameterized="true"/>
1414
<element name="deleted" type="text" selector="((//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//span[contains(@class,'placeholder') and contains(text(),'Block with ID: {{arg}} doesn')])" parameterized="true"/>

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

Lines changed: 2 additions & 2 deletions
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/utils/nesting-link-dialog.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/utils/nesting-widget-dialog.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/template/content-type/banner/collage-centered/preview.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77

88
<div class="pagebuilder-content-type pagebuilder-banner type-nested" attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
9-
<render args="getOptions().template"/>
9+
<render args="getOptions().template"></render>
1010
<div class="pagebuilder-banner-wrapper"
1111
attr="data.wrapper.attributes"
1212
ko-style="Object.assign({}, data.wrapper.style(), {backgroundImage: getBackgroundImage()})"
@@ -20,7 +20,7 @@
2020
attr="data.video_overlay.attributes"
2121
ko-style="data.video_overlay.style"></div>
2222
<scope args="getUploader().getUiComponent()">
23-
<render/>
23+
<render></render>
2424
</scope>
2525
<div class="pagebuilder-overlay" css="data.overlay.css" attr="data.overlay.attributes" ko-style="data.overlay.style">
2626
<div class="pagebuilder-collage-content" event="mousedown: activateEditor">

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/preview.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77

88
<div class="pagebuilder-content-type pagebuilder-banner type-nested" attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
9-
<render args="getOptions().template"/>
9+
<render args="getOptions().template"></render>
1010
<div class="pagebuilder-banner-wrapper"
1111
attr="data.wrapper.attributes"
1212
ko-style="Object.assign({}, data.wrapper.style(), {backgroundImage: getBackgroundImage()})"
@@ -20,7 +20,7 @@
2020
attr="data.video_overlay.attributes"
2121
ko-style="data.video_overlay.style"></div>
2222
<scope args="getUploader().getUiComponent()">
23-
<render/>
23+
<render></render>
2424
</scope>
2525
<div class="pagebuilder-overlay" css="data.overlay.css" attr="data.overlay.attributes" ko-style="data.overlay.style">
2626
<div class="pagebuilder-collage-content" event="mousedown: activateEditor">

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/preview.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77

88
<div class="pagebuilder-content-type pagebuilder-banner type-nested" attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
9-
<render args="getOptions().template"/>
9+
<render args="getOptions().template"></render>
1010
<div class="pagebuilder-banner-wrapper"
1111
attr="data.wrapper.attributes"
1212
ko-style="Object.assign({}, data.wrapper.style(), {backgroundImage: getBackgroundImage()})"
@@ -20,7 +20,7 @@
2020
attr="data.video_overlay.attributes"
2121
ko-style="data.video_overlay.style"></div>
2222
<scope args="getUploader().getUiComponent()">
23-
<render/>
23+
<render></render>
2424
</scope>
2525
<div class="pagebuilder-overlay" attr="data.overlay.attributes" ko-style="data.overlay.style" css="data.overlay.css">
2626
<div class="pagebuilder-collage-content" event="mousedown: activateEditor">

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/preview.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77

88
<div class="pagebuilder-content-type pagebuilder-banner type-nested" attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
9-
<render args="getOptions().template" />
9+
<render args="getOptions().template" ></render>
1010
<div class="pagebuilder-banner-wrapper"
1111
attr="data.wrapper.attributes"
1212
ko-style="Object.assign({}, data.wrapper.style(), {backgroundImage: getBackgroundImage()})"
@@ -18,9 +18,9 @@
1818
<div if="data.video_overlay.attributes()['data-video-overlay-color']"
1919
class="video-overlay"
2020
attr="data.video_overlay.attributes"
21-
ko-style="data.video_overlay.style" />
21+
ko-style="data.video_overlay.style" ></div>
2222
<scope args="getUploader().getUiComponent()">
23-
<render />
23+
<render ></render>
2424
</scope>
2525
<div class="pagebuilder-overlay pagebuilder-poster-overlay" attr="data.overlay.attributes" ko-style="data.overlay.style" css="data.overlay.css" event="mousedown: activateEditor">
2626
<div class="pagebuilder-poster-content">
@@ -35,7 +35,7 @@
3535
event="mousedown: stopEvent, click: activateEditor, dblclick: handleDoubleClick">
3636
</div>
3737
<div if="isWysiwygSupported()" class="placeholder-text" ifnot="data.content.html" translate="'Edit Banner Text'"></div>
38-
<textarea ifnot="isWysiwygSupported()" class="inline-wysiwyg-textarea" afterRender="initTextarea" event="{keyup: onTextareaKeyUp, focus: onTextareaFocus, blur: onTextareaBlur, mousedown: stopEvent}" attr="placeholder: $t('Edit Banner Text')"/>
38+
<textarea ifnot="isWysiwygSupported()" class="inline-wysiwyg-textarea" afterRender="initTextarea" event="{keyup: onTextareaKeyUp, focus: onTextareaFocus, blur: onTextareaBlur, mousedown: stopEvent}" attr="placeholder: $t('Edit Banner Text')"></textarea>
3939
</div>
4040
<a if="data.main.attributes()['data-show-button'] !== 'never'"
4141
type="button"

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/block/default/preview.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,21 @@
77

88
<div class="pagebuilder-content-type pagebuilder-block" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false" css="{'pagebuilder-block-overlay': displayingBlockPreview()}">
99
<div attr="data.main.attributes" ko-style="data.main.style" css="data.main.css">
10-
<div if="displayingBlockPreview" class="rendered-content" html="data.main.html" afterRender="initializeWidgets"></div>
10+
<!-- ko if: displayingBlockPreview -->
11+
<!-- ko with: {dataMainUnsanitizedHtml: data.main.html, initializeWidgets: initializeWidgets} -->
12+
<div class="rendered-content" html="dataMainUnsanitizedHtml" afterRender="initializeWidgets"></div>
13+
<!-- /ko -->
14+
<!-- /ko -->
1115
<div ifnot="displayingBlockPreview" class="pagebuilder-block-placeholder">
12-
<span class="placeholder-text" text="placeholderText"/>
16+
<span class="placeholder-text" text="placeholderText"></span>
1317
</div>
1418
</div>
1519
<div data-role="spinner"
1620
class="admin__data-grid-loading-mask"
1721
if="loading">
1822
<div class="spinner">
19-
<span repeat="8"/>
23+
<span repeat="8"></span>
2024
</div>
2125
</div>
22-
<render args="getOptions().template" />
26+
<render args="getOptions().template" ></render>
2327
</div>

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
ko-style="data.main.style"
1010
css="Object.assign({focused: $parent.parentContentType.preview.focusedButton() === $index()}, data.main.css())"
1111
class="pagebuilder-content-type pagebuilder-button-item no-system-border focus-options">
12-
<render args="getOptions().template" />
12+
<render args="getOptions().template" ></render>
1313
<a attr="data.link.attributes"
1414
ko-style="data.link.style"
1515
css="data.link.css"

0 commit comments

Comments
 (0)