Ariel Weinberger pushed to branch feature/CHANNELMGR-1456 at cms-community /
hippo-addon-channel-manager
Commits:
7f83d96f by Ariel Weinberger at 2017-09-14T12:03:32+02:00
CHANNELMGR-1456 Removed console.log and renamed variable from isVisible to
isToolbarVisible
- - - - -
2 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
Changes:
=====================================
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.controller.js
@@ -73,7 +73,6 @@ class CKEditorController {
this.editor.on('blur', () => this.onEditorBlur(this.blurEvent));
this.editor.on('dialogShow', () => {
- console.log('test');
this.SharedSpaceToolbarService.isToolbarPinned = true;
});
this.editor.on('dialogHide', () => {
this.SharedSpaceToolbarService.isToolbarPinned = false; });
@@ -128,7 +127,7 @@ class CKEditorController {
},
});
- if (!this.SharedSpaceToolbarService.isVisible) {
+ if (!this.SharedSpaceToolbarService.isToolbarVisible) {
this.SharedSpaceToolbarService.showToolbar({
hasBottomToolbar: this.config.hippo &&
this.config.hippo.hasBottomToolbar,
});
=====================================
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/ckeditor/sharedspace-toolbar/sharedspace-toolbar.controller.js
@@ -40,7 +40,7 @@ class SharedSpaceToolbar {
setToolbarVisible(state, options = {}) {
this.isVisible = state;
- this.SharedSpaceToolbarService.isVisible = this.isVisible;
+ this.SharedSpaceToolbarService.isToolbarVisible = this.isVisible;
this.showBottomToolbar = options.hasBottomToolbar || false;
this.$rootScope.$apply();
this._fixScrollingPosition(state);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/7f83d96f6925e2876f61d055d4773aa9816e0090
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/7f83d96f6925e2876f61d055d4773aa9816e0090
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
