Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-842 at
cms-community / hippo-addon-channel-manager
Commits:
7a67f0db by Mark at 2016-09-06T16:25:12+02:00
CHANNELMGR-842 fix watch to close left panel on exiting edit mode
- - - - -
2faaf93f by Mark at 2016-09-06T16:29:01+02:00
CHANNELMGR-842 refactor watch to be in a function
- - - - -
a66878d6 by Mark at 2016-09-06T16:30:43+02:00
Merge branch 'feature/visual-editing-psp1-CHANNELMGR-842' of
code.onehippo.org:cms-community/hippo-addon-channel-manager into
feature/visual-editing-psp1-CHANNELMGR-842
- - - - -
424a38b7 by Mark at 2016-09-06T16:40:16+02:00
CHANNELMGR-842 toggle as a component
- - - - -
5 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
- frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.js
-
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.controller.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.component.js
- −
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.directive.js
-
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.html
Changes:
=====================================
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
@@ -18,16 +18,20 @@ export class ChannelLeftSidePanelCtrl {
constructor($scope, $element, ChannelSidePanelService, ChannelService,
SiteMapService, HippoIframeService) {
'ngInject';
+ this.$scope = $scope;
this.ChannelService = ChannelService;
this.ChannelSidePanelService = ChannelSidePanelService;
this.SiteMapService = SiteMapService;
this.HippoIframeService = HippoIframeService;
ChannelSidePanelService.initialize('left',
$element.find('.channel-left-side-panel'));
+ this.closePanelOnEditModeTurnedOff();
+ }
- $scope.$watch('leftSidePanel.editMode', () => {
+ closePanelOnEditModeTurnedOff() {
+ this.$scope.$watch('$ctrl.editMode', () => {
if (!this.editMode) {
- ChannelSidePanelService.close('left');
+ this.ChannelSidePanelService.close('left');
}
});
}
=====================================
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
@@ -15,14 +15,12 @@
*/
import { ChannelSidePanelService } from './../sidePanel.service';
-import { ChannelLeftSidePanelToggleCtrl } from
'./leftSidePanelToggle.controller';
-import { channelLeftSidePanelToggleDirective } from
'./leftSidePanelToggle.directive';
+import channelLeftSidePanelToggleComponentModule from
'./leftSidePanelToggle.component.js';
import channelLeftSidePanelComponentModule from './leftSidePanel.component';
export const channelLeftSidePanelModule = angular
.module('hippo-cm.channel.leftSidePanel', [
+ channelLeftSidePanelToggleComponentModule.name,
channelLeftSidePanelComponentModule.name,
])
- .service('ChannelSidePanelService', ChannelSidePanelService)
- .controller('ChannelLeftSidePanelToggleCtrl', ChannelLeftSidePanelToggleCtrl)
- .directive('channelLeftSidePanelToggle',
channelLeftSidePanelToggleDirective);
+ .service('ChannelSidePanelService', ChannelSidePanelService);
=====================================
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.controller.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.component.js
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.component.js
@@ -30,3 +30,15 @@ export class ChannelLeftSidePanelToggleCtrl {
return this.ChannelSidePanelService.isOpen('left');
}
}
+
+const channelLeftSidePanelToggleComponentModule = angular
+ .module('hippo-cm.channel.leftSidePanelToggleComponentModule', [])
+ .component('channelLeftSidePanelToggle', {
+ bindings: {
+ disabled: '=',
+ },
+ controller: ChannelLeftSidePanelToggleCtrl,
+ templateUrl: 'channel/sidePanels/leftSidePanel/leftSidePanelToggle.html',
+ });
+
+export default channelLeftSidePanelToggleComponentModule;
=====================================
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.directive.js
deleted
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.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 channelLeftSidePanelToggleDirective() {
- 'ngInject';
-
- return {
- restrict: 'E',
- bindToController: {
- disabled: '=',
- },
- templateUrl: 'channel/sidePanels/leftSidePanel/leftSidePanelToggle.html',
- controller: 'ChannelLeftSidePanelToggleCtrl',
- controllerAs: 'toggle',
- };
-}
=====================================
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.html
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.html
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.html
@@ -16,8 +16,8 @@
<md-button class="md-icon-button md-icon-button-left-side-panel
qa-button-sidenav"
aria-label="{{ 'TOOLBAR_BUTTON_LEFT_SIDE_PANEL' | translate }}"
- ng-disabled="toggle.disabled"
- ng-click="toggle.toggleLeftSidePanel()">
+ ng-disabled="$ctrl.disabled"
+ ng-click="$ctrl.toggleLeftSidePanel()">
<md-icon title="{{ 'TOOLBAR_BUTTON_LEFT_SIDE_PANEL' | translate }}"
- md-svg-src="{{ toggle.isLeftSidePanelOpen() ?
'images/left-side-panel-arrow-left.svg' :
'images/left-side-panel-arrow-right.svg' }}" />
+ md-svg-src="{{ $ctrl.isLeftSidePanelOpen() ?
'images/left-side-panel-arrow-left.svg' :
'images/left-side-panel-arrow-right.svg' }}" />
</md-button>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/7158a72dd034b5eae318cdd4ca1b44b71bfb2f15...424a38b73e1acfee6d33604ccab4d8fe5e527be8
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
