Joeri de Gooijer pushed to branch feature/visual-editing-psp1 at cms-community
/ hippo-addon-channel-manager
Commits:
edbec70d by Joeri de Gooijer at 2017-02-16T16:37:48+01:00
CHANNELMGR-840 Move componentCatalog to left side panel
- - - - -
9 changed files:
- frontend-ng/src/angularjs/channel/channel.js
-
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.component.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
-
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.controller.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
-
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.controller.spec.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.spec.js
- frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.html →
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
- frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.module.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.module.js
-
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.service.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.service.js
-
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.service.spec.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.service.spec.js
-
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.module.js
Changes:
=====================================
frontend-ng/src/angularjs/channel/channel.js
=====================================
--- a/frontend-ng/src/angularjs/channel/channel.js
+++ b/frontend-ng/src/angularjs/channel/channel.js
@@ -25,7 +25,6 @@ import channelMenuModule from './menu/editor';
import maskModule from './mask/mask.module';
import channelRelevanceModule from './relevance/relevance';
import channelViewportsModule from './viewports/viewports';
-import componentCatalogModule from
'./componentCatalog/componentCatalog.module';
import config from './channel.config';
import ChannelCtrl from './channel.controller';
import ChannelService from './channel.service';
@@ -44,7 +43,6 @@ const channelModule = angular
channelRelevanceModule.name,
channelViewportsModule.name,
maskModule.name,
- componentCatalogModule.name,
])
.config(config)
.controller('ChannelCtrl', ChannelCtrl)
=====================================
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.component.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
=====================================
---
a/frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
=====================================
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.controller.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
=====================================
---
a/frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
=====================================
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.controller.spec.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.spec.js
=====================================
---
a/frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.spec.js
=====================================
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.html →
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
=====================================
--- a/frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.html
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
=====================================
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.module.js →
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.module.js
=====================================
---
a/frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.module.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.module.js
=====================================
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.service.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.service.js
=====================================
---
a/frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.service.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.service.js
=====================================
frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.service.spec.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.service.spec.js
=====================================
---
a/frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.service.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.service.spec.js
=====================================
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.module.js
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.module.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.module.js
@@ -16,9 +16,12 @@
import leftSidePanelComponent from './leftSidePanel.component';
import leftSidePanelToggleComponent from './leftSidePanelToggle.component';
+import componentCatalogModule from
'./componentCatalog/componentCatalog.module';
const leftSidePanelModule = angular
- .module('hippo-cm.channel.leftSidePanelModule', [])
+ .module('hippo-cm.channel.leftSidePanelModule', [
+ componentCatalogModule.name,
+ ])
.component('leftSidePanel', leftSidePanelComponent)
.component('leftSidePanelToggle', leftSidePanelToggleComponent);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/edbec70dc78cf0480bbaef66fd12bb52d7809a1c
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
