Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at
cms-community / hippo-addon-channel-manager
Commits:
e101db1c by Mark at 2016-09-20T16:03:21+02:00
CHANNELMGR-843 add dummy content
- - - - -
1c1c6ad3 by Mark at 2016-09-20T16:44:24+02:00
CHANNELMGR-843 do not close the other panel when opening one
- - - - -
3 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.html
- frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
- frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.spec.js
Changes:
=====================================
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.html
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.html
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.html
@@ -25,7 +25,14 @@
<h1 class="md-title">{{'EDIT_DOCUMENT' | translate }}</h1>
</div>
<md-content flex="grow" layout-padding>
- Right Side Panel
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</md-content>
<div layout="row" layout-align="end center" flex="none">
<md-button class="md-primary">{{'SAVE' | translate }}</md-button>
=====================================
frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
=====================================
--- a/frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
+++ b/frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
@@ -34,10 +34,6 @@ export class ChannelSidePanelService {
this.panels[side].jQueryElement = jQueryElement;
}
- scale(side) {
- this.ScalingService.setPushWidth(side, this.isOpen(side) ?
this.panels[side].jQueryElement.width() : 0);
- }
-
toggle(side) {
if (this.isOpen(side)) {
this.close(side);
@@ -48,9 +44,8 @@ export class ChannelSidePanelService {
open(side) {
if (!this.isOpen(side)) {
- this.close(side === 'left' ? 'right' : 'left');
this.$mdSidenav(this.panels[side].element).open();
- this.scale(side);
+ this.ScalingService.setPushWidth(side,
this.panels[side].jQueryElement.width());
}
}
=====================================
frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.spec.js
=====================================
--- a/frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.spec.js
+++ b/frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.spec.js
@@ -21,7 +21,7 @@ describe('ChannelSidePanelService', () => {
let ChannelSidePanelService;
let ScalingService;
- const leftSidePanel = jasmine.createSpyObj('leftSidePanel', ['isOpen',
'toggle', 'close']);
+ const leftSidePanel = jasmine.createSpyObj('leftSidePanel', ['isOpen',
'toggle', 'open', 'close']);
beforeEach(() => {
module('hippo-cm');
@@ -47,20 +47,20 @@ describe('ChannelSidePanelService', () => {
ScalingService.setPushWidth.calls.reset();
leftSidePanel.toggle.calls.reset();
- leftSidePanel.isOpen.and.returnValue(true);
+ leftSidePanel.isOpen.and.returnValue(false);
ChannelSidePanelService.toggle('left');
- expect(leftSidePanel.toggle).toHaveBeenCalled();
+ expect(leftSidePanel.open).toHaveBeenCalled();
expect(ScalingService.setPushWidth).toHaveBeenCalledWith('left', 250);
ScalingService.setPushWidth.calls.reset();
leftSidePanel.toggle.calls.reset();
- leftSidePanel.isOpen.and.returnValue(false);
+ leftSidePanel.isOpen.and.returnValue(true);
ChannelSidePanelService.toggle('left');
- expect(leftSidePanel.toggle).toHaveBeenCalled();
+ expect(leftSidePanel.close).toHaveBeenCalled();
expect(ScalingService.setPushWidth).toHaveBeenCalledWith('left', 0);
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/4bec538d7189e9b5546673814a6a9ad2032272f2...1c1c6ad3ff0602460f13d480d7a5160472c47d1b
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
