Skip to content

Commit 829693b

Browse files
committed
MAGETWO-91375: Refactor drag & drop code
- Rename block to contentType - Fix event names
1 parent d116ccb commit 829693b

File tree

16 files changed

+70
-64
lines changed

16 files changed

+70
-64
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/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/content-type/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/content-type/tabs/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/drag-drop/container-animation.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/drag-drop/move-content-type.js

Lines changed: 3 additions & 3 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/drag-drop/registry.js

Lines changed: 7 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/js/drag-drop/sortable.js

Lines changed: 14 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/panel.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/ts/js/content-type/column-group/preview.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import ContentTypeConfigInterface from "../../content-type-config.d";
1414
import ContentTypeInterface from "../../content-type.d";
1515
import {animationTime} from "../../drag-drop/container-animation";
1616
import {moveContentType} from "../../drag-drop/move-content-type";
17-
import {getDraggedBlockConfig} from "../../drag-drop/registry";
17+
import {getDraggedContentTypeConfig} from "../../drag-drop/registry";
1818
import {moveArrayItem} from "../../utils/array";
1919
import {createStyleSheet} from "../../utils/create-stylesheet";
2020
import {default as ColumnGroupPreview} from "../column-group/preview";
@@ -738,7 +738,7 @@ export default class Preview extends PreviewCollection {
738738
});
739739
},
740740
activate() {
741-
if (getDraggedBlockConfig() === Config.getContentTypeConfig("column")) {
741+
if (getDraggedContentTypeConfig() === Config.getContentTypeConfig("column")) {
742742
group.find(".ui-sortable").each(function() {
743743
if ($(this).data("sortable")) {
744744
$(this).sortable("option", "disabled", true);
@@ -775,7 +775,7 @@ export default class Preview extends PreviewCollection {
775775
self.dropPositions = calculateDropPositions((self.parent as ContentTypeCollectionInterface));
776776

777777
// Is the element currently being dragged a column?
778-
if (getDraggedBlockConfig() === Config.getContentTypeConfig("column")) {
778+
if (getDraggedContentTypeConfig() === Config.getContentTypeConfig("column")) {
779779
self.dropOverElement = true;
780780
} else {
781781
self.dropOverElement = null;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ export default class Preview {
199199
if (elementNodes.length > 0) {
200200
const element = elementNodes[0];
201201
this.wrapperElement = element;
202-
events.trigger("block:afterRender", {id: this.parent.id, block: this.parent, element});
202+
events.trigger("contentType:afterRender", {id: this.parent.id, block: this.parent, element});
203203
events.trigger(
204-
this.parent.config.name + ":block:afterRender",
204+
this.parent.config.name + ":contentType:afterRender",
205205
{
206206
block: this.parent,
207207
element,

0 commit comments

Comments
 (0)