Skip to content

Commit 49b58e2

Browse files
Merge pull request #572 from magento/514_content-snapshot-category-admin-page_refactor
#514: User sees content snapshot on Category Page in Admin Panel - refactoring
2 parents b7c42c5 + f127cdb commit 49b58e2

File tree

20 files changed

+266
-361
lines changed

20 files changed

+266
-361
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/config.js

Lines changed: 0 additions & 40 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/content-type/banner/preview.js

Lines changed: 20 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/content-type/image/preview.js

Lines changed: 22 additions & 0 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/content-type/preview.js

Lines changed: 10 additions & 14 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/content-type/slide/preview.js

Lines changed: 20 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/form/element/image-uploader.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ define([
2121
$uploadArea: null,
2222
isShowImageUploadInstructions: true,
2323
isShowImageUploadOptions: false,
24+
visibleControls: true,
2425
classes: {
2526
dragging: 'dragging',
2627
draggingInside: 'dragging-inside',
@@ -45,6 +46,9 @@ define([
4546
or: $t('or'),
4647
uploadImage: $t('Upload Image'),
4748
uploadNewImage: $t('Upload New Image')
49+
},
50+
tracks: {
51+
visibleControls: true
4852
}
4953
},
5054

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

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ define([
5757
initObservable: function () {
5858
this._super()
5959
.observe('isComponentInitialized visiblePageBuilder wysiwygConfigData loading transition ' +
60-
'transitionOut');
60+
'transitionOut overlayMouseover');
6161

6262
return this;
6363
},
@@ -100,10 +100,6 @@ define([
100100
selector: this.stageSelector
101101
}, this.disableDomObserver.bind(this));
102102

103-
if (!this.wysiwygConfigData()['pagebuilder_button']) {
104-
this.visiblePageBuilder(true);
105-
}
106-
107103
if (!this.wysiwygConfigData()['pagebuilder_button'] ||
108104
this.wysiwygConfigData()['pagebuilder_content_snapshot']) {
109105
this.visiblePageBuilder(true);
@@ -153,34 +149,14 @@ define([
153149
}
154150
},
155151

156-
/**
157-
* Overlay MouseOver
158-
*/
159-
onOverlayMouseOver: function () {
160-
if (!this.overlayMouseover && !$(this.overlaySelector).hasClass('_hover')) {
161-
$(this.overlaySelector).addClass('_hover');
162-
}
163-
this.overlayMouseover = true;
164-
},
165-
166-
/**
167-
* Overlay MouseOut
168-
*/
169-
onOverlayMouseOut: function () {
170-
if (this.overlayMouseover && $(this.overlaySelector).hasClass('_hover')) {
171-
$(this.overlaySelector).removeClass('_hover');
172-
}
173-
this.overlayMouseover = false;
174-
},
175-
176152
/**
177153
* Press Enter key on Overlay
178154
*/
179155
onOverlayKeyDown: function (context, event) {
180156
if (event.which === 13 || event.keyCode === 13) {
181157
this.pageBuilderEditButtonClick(context, event);
182158
}
183-
159+
184160
return true;
185161
},
186162

@@ -189,7 +165,7 @@ define([
189165
*/
190166
toggleFullScreen: function () {
191167
events.trigger('stage:' + this.pageBuilder.id + ':toggleFullscreen', {
192-
animate: false
168+
animate: !!this.wysiwygConfigData()['pagebuilder_content_snapshot']
193169
});
194170
},
195171

0 commit comments

Comments
 (0)