Joeri de Gooijer pushed to branch feature/visual-editing-psp1-CHANNELMGR-842 at
cms-community / hippo-addon-channel-manager
Commits:
2c1d48f2 by Joeri de Gooijer at 2016-09-06T16:01:03+02:00
CHANNELMGR-842 refactor the leftsidepanel to a angular component
- - - - -
4 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
- −
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.directive.js
- frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.html
- frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.js
Changes:
=====================================
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
@@ -53,3 +53,15 @@ export class ChannelLeftSidePanelCtrl {
return siteMapItem.renderPathInfo ===
this.HippoIframeService.getCurrentRenderPathInfo();
}
}
+
+const channelLeftSidePanelComponentModule = angular
+ .module('hippo-cm.channel.leftSidePanelComponentModule', [])
+ .component('channelLeftSidePanel', {
+ bindings: {
+ editMode: '=',
+ },
+ controller: ChannelLeftSidePanelCtrl,
+ templateUrl: 'channel/sidePanels/leftSidePanel/leftSidePanel.html',
+ });
+
+export default channelLeftSidePanelComponentModule;
=====================================
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.directive.js
deleted
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.directive.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2016 Hippo B.V. (http://www.onehippo.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export function channelLeftSidePanelDirective() {
- 'ngInject';
-
- return {
- restrict: 'E',
- bindToController: {
- editMode: '=',
- },
- templateUrl: 'channel/sidePanels/leftSidePanel/leftSidePanel.html',
- controller: 'ChannelLeftSidePanelCtrl',
- controllerAs: 'leftSidePanel',
- };
-}
=====================================
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.html
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.html
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.html
@@ -19,10 +19,10 @@
<md-tab label="{{ 'LEFT_SIDE_PANEL_TAB_SITEMAP' | translate }}">
<md-list md-no-ink class="qa-sitemap">
<md-list-item class="md-2-line qa-sitemap-item"
- ng-class="{'list-item-active':
leftSidePanel.isActiveSiteMapItem(item) }"
- ng-repeat="item in leftSidePanel.getSiteMap()"
- md-autofocus="leftSidePanel.isActiveSiteMapItem(item)"
- ng-click="leftSidePanel.showPage(item)">
+ ng-class="{'list-item-active':
$ctrl.isActiveSiteMapItem(item) }"
+ ng-repeat="item in $ctrl.getSiteMap()"
+ md-autofocus="$ctrl.isActiveSiteMapItem(item)"
+ ng-click="$ctrl.showPage(item)">
<div class="md-list-item-text">
<h4 class="qa-pathinfo">{{ item.pathInfo | startWithSlash }}</h4>
<p class="qa-name">{{ item.pageTitle || item.name }}</p>
@@ -32,10 +32,10 @@
</md-list>
</md-tab>
<md-tab label="{{ 'LEFT_SIDE_PANEL_TAB_COMPONENTS' | translate }}"
- ng-if="leftSidePanel.showComponentsTab()">
+ ng-if="$ctrl.showComponentsTab()">
<md-list md-no-ink class="qa-catalog">
<md-list-item class="md-1-line catalog-dd-container"
- ng-repeat="component in leftSidePanel.getCatalog()">
+ ng-repeat="component in $ctrl.getCatalog()">
<div layout="row"
layout-align="start center"
catalog-component="component"
=====================================
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.js
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.js
@@ -14,16 +14,15 @@
* limitations under the License.
*/
-import { ChannelSidePanelService } from './../sidePanel.service.js';
-import { ChannelLeftSidePanelToggleCtrl } from
'./leftSidePanelToggle.controller.js';
-import { channelLeftSidePanelToggleDirective } from
'./leftSidePanelToggle.directive.js';
-import { ChannelLeftSidePanelCtrl } from './leftSidePanel.controller.js';
-import { channelLeftSidePanelDirective } from './leftSidePanel.directive.js';
+import { ChannelSidePanelService } from './../sidePanel.service';
+import { ChannelLeftSidePanelToggleCtrl } from
'./leftSidePanelToggle.controller';
+import { channelLeftSidePanelToggleDirective } from
'./leftSidePanelToggle.directive';
+import channelLeftSidePanelComponentModule from './leftSidePanel.component';
export const channelLeftSidePanelModule = angular
- .module('hippo-cm.channel.leftSidePanel', [])
+ .module('hippo-cm.channel.leftSidePanel', [
+ channelLeftSidePanelComponentModule.name,
+ ])
.service('ChannelSidePanelService', ChannelSidePanelService)
.controller('ChannelLeftSidePanelToggleCtrl', ChannelLeftSidePanelToggleCtrl)
- .controller('ChannelLeftSidePanelCtrl', ChannelLeftSidePanelCtrl)
- .directive('channelLeftSidePanelToggle', channelLeftSidePanelToggleDirective)
- .directive('channelLeftSidePanel', channelLeftSidePanelDirective);
+ .directive('channelLeftSidePanelToggle',
channelLeftSidePanelToggleDirective);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/2c1d48f2c08beacbe311dfd5bdb5f54505f5eada
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
