Skip to content

Commit 2521ac9

Browse files
committed
MC-4265: update composer.json for magento/module-page-builder-analytics
- move uploader and widget-intializer.d
1 parent 8c76468 commit 2521ac9

File tree

9 files changed

+35
-26
lines changed

9 files changed

+35
-26
lines changed

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/content-type/image/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/content-type/slide/preview.js

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {DataObject} from "../../data-store";
1111
import WysiwygFactory from "../../wysiwyg/factory";
1212
import WysiwygInterface from "../../wysiwyg/wysiwyg-interface";
1313
import BasePreview from "../preview";
14-
import Uploader from "../uploader";
14+
import Uploader from "../../uploader";
1515

1616
/**
1717
* @api

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import events from "Magento_PageBuilder/js/events";
88
import {DataObject} from "../../data-store";
99
import ContentTypeAfterRenderEventParamsInterface from "../content-type-after-render-event-params";
1010
import BasePreview from "../preview";
11-
import Uploader from "../uploader";
11+
import Uploader from "../../uploader";
1212

1313
/**
1414
* @api

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

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import Config from "../../config";
1111
import ConditionalRemoveOption from "../../content-type-menu/conditional-remove-option";
1212
import {OptionsInterface} from "../../content-type-menu/option.d";
1313
import {DataObject} from "../../data-store";
14-
import WysiwygFactory from "../../wysiwyg/factory";
15-
import WysiwygInterface from "../../wysiwyg/wysiwyg-interface";
1614
import ContentTypeMountEventParamsInterface from "../content-type-mount-event-params";
1715
import BasePreview from "../preview";
1816
import SliderPreview from "../slider/preview";
19-
import Uploader from "../uploader";
17+
import Uploader from "../../uploader";
18+
import WysiwygFactory from "../../wysiwyg/factory";
19+
import WysiwygInterface from "../../wysiwyg/wysiwyg-interface";
2020

2121
/**
2222
* @api
@@ -38,6 +38,11 @@ export default class Preview extends BasePreview {
3838
*/
3939
private element: HTMLElement;
4040

41+
/**
42+
* Uploader instance
43+
*/
44+
private uploader: Uploader;
45+
4146
/**
4247
* Slide flag
4348
*/
@@ -135,17 +140,7 @@ export default class Preview extends BasePreview {
135140
* @returns {Uploader}
136141
*/
137142
public getUploader() {
138-
const dataStore = this.parent.dataStore.get();
139-
const initialImageValue = dataStore[this.config.additional_data.uploaderConfig.dataScope] || "";
140-
141-
// Create uploader
142-
return new Uploader(
143-
"imageuploader_" + this.parent.id,
144-
this.config.additional_data.uploaderConfig,
145-
this.parent.id,
146-
this.parent.dataStore,
147-
initialImageValue,
148-
);
143+
return this.uploader;
149144
}
150145

151146
/**
@@ -256,6 +251,18 @@ export default class Preview extends BasePreview {
256251

257252
events.on(`${this.config.name}:mountAfter`, (args: ContentTypeMountEventParamsInterface) => {
258253
if (args.id === this.parent.id) {
254+
const dataStore = this.parent.dataStore.get();
255+
const initialImageValue = dataStore[this.config.additional_data.uploaderConfig.dataScope] || "";
256+
257+
// Create uploader
258+
this.uploader = new Uploader(
259+
"imageuploader_" + this.parent.id,
260+
this.config.additional_data.uploaderConfig,
261+
this.parent.id,
262+
this.parent.dataStore,
263+
initialImageValue,
264+
);
265+
259266
// Update the display label for the slide
260267
const slider = this.parent.parent;
261268
this.displayLabel($t(`Slide ${slider.children().indexOf(this.parent) + 1}`));

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/uploader.ts renamed to app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/uploader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import events from "Magento_PageBuilder/js/events";
77
import layout from "uiLayout";
88
import registry from "uiRegistry";
9-
import DataStore from "../data-store";
9+
import DataStore from "./data-store";
1010

1111
interface UploaderConfigInterface {
1212
id: string;

0 commit comments

Comments
 (0)