Canh Ngo pushed to branch feature/cmng-psp1-CHANNELMGR-467 at cms-community /
hippo-addon-channel-manager
Commits:
9475462d by Canh Ngo at 2016-03-21T09:27:37+01:00
CHANNELMGR-467: Used specific methods to retrieve elements rather than generic
get/set JQueryElement() in PageStructureElement
- - - - -
6 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.js
-
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
- frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
- frontend-ng/src/angularjs/channel/page/element/containerElement.js
- frontend-ng/src/angularjs/channel/page/element/pageStructureElement.js
- frontend-ng/src/angularjs/channel/page/pageStructure.service.js
Changes:
=====================================
frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.js
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.js
@@ -60,7 +60,7 @@ export class DragDropService {
}
return this.dragulaPromise.then(() => {
- const iframeContainerElements = containers.map((container) =>
container.getJQueryElement('iframeBoxElement')[0]);
+ const iframeContainerElements = containers.map((container) =>
container.getBoxElement()[0]);
this.drake = this.iframe.dragula(iframeContainerElements, {
ignoreInputTextSelection: false,
@@ -90,7 +90,7 @@ export class DragDropService {
container.getComponents().forEach((component) => {
// Dragula will prevent mouseup events when dragging has not been
started,
// so there's only a mouseup event when the component is clicked.
- component.getJQueryElement('iframeBoxElement').on('mouseup', () =>
callback(component));
+ component.getBoxElement().on('mouseup', () => callback(component));
});
});
}
@@ -141,7 +141,7 @@ export class DragDropService {
clientX,
clientY,
});
- const iframeElement =
structureElement.getJQueryElement('iframeBoxElement');
+ const iframeElement = structureElement.getBoxElement();
iframeElement[0].dispatchEvent(iframeEvent);
}
=====================================
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
=====================================
---
a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
@@ -32,7 +32,7 @@ export class OverlayElementCtrl {
}
_prepareIframeElement($scope) {
- let boxJQueryElement =
this.structureElement.getJQueryElement('iframeBoxElement');
+ let boxJQueryElement = this.structureElement.getBoxElement();
let insertedTemporaryBox;
if (boxJQueryElement.length === 0) {
@@ -57,7 +57,7 @@ export class OverlayElementCtrl {
}
_createAndInsertTemporaryBox() {
- const startCommentJQueryElement =
this.structureElement.getJQueryElement('iframeStartComment');
+ const startCommentJQueryElement = this.structureElement.getStartComment();
const div = document.createElement('div');
if (startCommentJQueryElement[0].nextSibling !== null) {
=====================================
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
=====================================
---
a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
@@ -94,8 +94,8 @@ export class OverlaySyncService {
}
_syncElement(structureElement) {
- const overlayJQueryElement = structureElement.getJQueryElement('overlay');
- const iframeJQueryElement =
structureElement.getJQueryElement('iframeBoxElement');
+ const overlayJQueryElement = structureElement.getOverlayElement();
+ const iframeJQueryElement = structureElement.getBoxElement();
const rect = iframeJQueryElement[0].getBoundingClientRect();
=====================================
frontend-ng/src/angularjs/channel/page/element/containerElement.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/element/containerElement.js
+++ b/frontend-ng/src/angularjs/channel/page/element/containerElement.js
@@ -77,7 +77,7 @@ export class ContainerElement extends PageStructureElement {
}
getComponentByIframeElement(iframeElement) {
- return this.items.find((item) =>
item.getJQueryElement('iframeBoxElement').is(iframeElement));
+ return this.items.find((item) => item.getBoxElement().is(iframeElement));
}
replaceComponent(oldComponent, newComponent) {
=====================================
frontend-ng/src/angularjs/channel/page/element/pageStructureElement.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/element/pageStructureElement.js
+++ b/frontend-ng/src/angularjs/channel/page/element/pageStructureElement.js
@@ -22,9 +22,9 @@ export class PageStructureElement {
this.metaData = metaData;
this.jQueryElements = {};
- this.setJQueryElement('iframeStartComment', $(startCommentDomElement));
- this.setJQueryElement('iframeEndComment', $(endCommentDomElement));
- this.setJQueryElement('iframeBoxElement', $(boxDomElement));
+ this.setStartComment($(startCommentDomElement));
+ this.setEndComment($(endCommentDomElement));
+ this.setBoxElement($(boxDomElement));
}
setJQueryElement(elementType, element) {
@@ -119,4 +119,12 @@ export class PageStructureElement {
setBoxElement(newJQueryBoxElement) {
this.setJQueryElement('iframeBoxElement', newJQueryBoxElement);
}
+
+ getOverlayElement() {
+ return this.getJQueryElement('overlay');
+ }
+
+ setOverlayElement(newJQueryOverlayElement) {
+ this.setJQueryElement('overlay', newJQueryOverlayElement);
+ }
}
=====================================
frontend-ng/src/angularjs/channel/page/pageStructure.service.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/pageStructure.service.js
+++ b/frontend-ng/src/angularjs/channel/page/pageStructure.service.js
@@ -118,7 +118,7 @@ export class PageStructureService {
}
getContainerByIframeElement(containerIFrameElement) {
- return this.containers.find((container) =>
container.getJQueryElement('iframeBoxElement').is(containerIFrameElement));
+ return this.containers.find((container) =>
container.getBoxElement().is(containerIFrameElement));
}
showComponentProperties(componentElement) {
@@ -188,7 +188,7 @@ export class PageStructureService {
}
addComponentToContainer(catalogComponent, overlayDomElementOfContainer) {
- const container = this.containers.find((c) =>
c.getJQueryElement('overlay')[0] === overlayDomElementOfContainer);
+ const container = this.containers.find((c) => c.getOverlayElement()[0] ===
overlayDomElementOfContainer);
if (container) {
this.HstService.addHstComponent(catalogComponent, container.getId())
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/9475462d704e174243397f2dc480a2efbb6f20cd
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
