Arthur Bogaart pushed to branch feature/webpack at cms-community /
hippo-addon-channel-manager
Commits:
5b5ee175 by Arthur Bogaart at 2016-10-10T20:13:51+02:00
CHANNELMGR-863 Fix build errors related to import/prefer-default
- - - - -
11ccca65 by Arthur Bogaart at 2016-10-10T20:17:36+02:00
CHANNELMGR-863 FIx 'no-prototype-builtins' eslint error
- - - - -
6 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.spec.js
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
- frontend-ng/src/angularjs/channel/page/element/componentElement.js
- frontend-ng/src/angularjs/channel/page/element/embeddedLink.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.spec.js
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.spec.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.spec.js
@@ -120,7 +120,7 @@ describe('DragDropService', () => {
function boundEventHandlerCount(jqueryElement, event) {
const eventHandlers = $._data(jqueryElement[0], 'events');
- return eventHandlers && eventHandlers.hasOwnProperty(event) ?
eventHandlers[event].length : 0;
+ return eventHandlers && {}.hasOwnProperty.call(eventHandlers, event) ?
eventHandlers[event].length : 0;
}
it('is not dragging initially', () => {
=====================================
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
=====================================
---
a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
@@ -16,7 +16,7 @@
import angular from 'angular';
import 'angular-mocks';
-import { EmbeddedLink } from '../page/element/embeddedLink';
+import EmbeddedLink from '../page/element/embeddedLink';
describe('hippoIframeCtrl', () => {
let PageStructureService;
=====================================
frontend-ng/src/angularjs/channel/page/element/componentElement.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/element/componentElement.js
+++ b/frontend-ng/src/angularjs/channel/page/element/componentElement.js
@@ -16,7 +16,7 @@
/* eslint-disable prefer-const */
-import { PageStructureElement } from './pageStructureElement';
+import PageStructureElement from './pageStructureElement';
class ComponentElement extends PageStructureElement {
constructor(startCommentDomElement, metaData, container, commentProcessor) {
=====================================
frontend-ng/src/angularjs/channel/page/element/embeddedLink.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/element/embeddedLink.js
+++ b/frontend-ng/src/angularjs/channel/page/element/embeddedLink.js
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { PageStructureElement } from './pageStructureElement';
+import PageStructureElement from './pageStructureElement';
class EmbeddedLink extends PageStructureElement {
=====================================
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
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { HstConstants } from '../../../api/hst.constants';
+import HstConstants from '../../../api/hst.constants';
class PageStructureElement {
constructor(type, metaData, startCommentDomElement, endCommentDomElement,
boxDomElement) {
=====================================
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
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-import { ComponentElement } from './element/componentElement';
-import { ContainerElement } from './element/containerElement';
-import { EmbeddedLink } from './element/embeddedLink';
+import ComponentElement from './element/componentElement';
+import ContainerElement from './element/containerElement';
+import EmbeddedLink from './element/embeddedLink';
const EMBEDDED_LINK_MARKUP = '<a class="hst-cmseditlink"></a>';
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/ac3bc05107fb930b7ffc37e34126df116d9f0cc3...11ccca65cc363291d13fd106374d0217601a29dc
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
