Skip to content

Commit 0cc0265

Browse files
committed
MC-5403: Edit With Page Builder Button Is Slow Opening Page Builder And No Loading Indicator After 1st Load
- Resolve CR comments
1 parent 730c644 commit 0cc0265

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCreateProductTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,6 @@
383383
<waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccessAfterAttribute"/>
384384
<!-- Set background colour of row for our second custom attribute -->
385385
<comment userInput="Set background colour of row for our second custom attribute" stepKey="commentSetBackgroundColor1"/>
386-
<scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
387386
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForAttribute2">
388387
<argument name="attributeCode" value="$$createPageBuilderAttribute2.attribute_code$$"/>
389388
</actionGroup>

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55

66
define([
77
'jquery',
8-
'Magento_Ui/js/lib/view/utils/async',
98
'underscore',
109
'Magento_Ui/js/form/element/wysiwyg',
1110
'mage/translate',
1211
'Magento_PageBuilder/js/events',
1312
'Magento_Ui/js/lib/view/utils/dom-observer',
1413
'Magento_PageBuilder/js/page-builder',
15-
'Magento_PageBuilder/js/utils/promise-deferred'
16-
], function (jQuery, $, _, Wysiwyg, $t, events, domObserver, PageBuilder, deferred) {
14+
'Magento_Ui/js/lib/view/utils/async'
15+
], function ($, _, Wysiwyg, $t, events, domObserver, PageBuilder) {
1716
'use strict';
1817

1918
/**
@@ -62,7 +61,7 @@ define([
6261
* Handle button click, init the Page Builder application
6362
*/
6463
pageBuilderEditButtonClick: function (context, event) {
65-
var modalInnerWrap = jQuery(event.currentTarget).parents('.modal-inner-wrap');
64+
var modalInnerWrap = $(event.currentTarget).parents('.modal-inner-wrap');
6665

6766
this.transition(false);
6867

@@ -74,7 +73,7 @@ define([
7473
}
7574

7675
if (!this.isComponentInitialized()) {
77-
this.disableDomObserver(jQuery(event.currentTarget).parent()[0]);
76+
this.disableDomObserver($(event.currentTarget).parent()[0]);
7877
}
7978

8079
this.initPageBuilder();
@@ -124,8 +123,8 @@ define([
124123
*/
125124
initPageBuilderListeners: function () {
126125
var id = this.pageBuilder.id,
127-
renderDeferred = jQuery.Deferred(),
128-
fullScreenDeferred = jQuery.Deferred(),
126+
renderDeferred = $.Deferred(),
127+
fullScreenDeferred = $.Deferred(),
129128
rendered = false;
130129

131130
events.on('stage:' + id + ':readyAfter', function () {
@@ -182,7 +181,7 @@ define([
182181
}.bind(this));
183182

184183
// Wait until the stage is rendered and full screen mode is activated
185-
jQuery.when(renderDeferred, fullScreenDeferred).done(function () {
184+
$.when(renderDeferred, fullScreenDeferred).done(function () {
186185
_.defer(function () {
187186
this.transition(true);
188187
}.bind(this));

0 commit comments

Comments
 (0)