Tobias Jeger pushed to branch feature/cmng-psp1-CHANNELMGR-467 at cms-community
/ hippo-addon-channel-manager
Commits:
c0da8219 by Tobias Jeger at 2016-03-17T14:40:46+01:00
CHANNELMGR-467: clean-up refactoring in pageStructure service
CHANNELMGR-494: prepare the global mask to prevent interaction with the
application when the component properties dialog is open.
- - - - -
4 changed files:
- frontend-ng/src/angularjs/channel/channel.html
- frontend-ng/src/angularjs/channel/page/pageStructure.service.js
- + frontend-ng/src/styles/_channel.scss
- frontend-ng/src/styles/hippo-cm.scss
Changes:
=====================================
frontend-ng/src/angularjs/channel/channel.html
=====================================
--- a/frontend-ng/src/angularjs/channel/channel.html
+++ b/frontend-ng/src/angularjs/channel/channel.html
@@ -60,3 +60,5 @@
</hippo-iframe>
</md-content>
+
+<div class="mask" ng-class="{ 'disallowed': channelCtrl.isDisallowed }"></div>
=====================================
frontend-ng/src/angularjs/channel/page/pageStructure.service.js
=====================================
--- a/frontend-ng/src/angularjs/channel/page/pageStructure.service.js
+++ b/frontend-ng/src/angularjs/channel/page/pageStructure.service.js
@@ -101,7 +101,6 @@ export class PageStructureService {
/**
* Remove the component identified by given Id
* @param componentId
- * @returns {*} a promise with removed successfully component
*/
removeComponentById(componentId) {
const component = this.getComponentById(componentId);
@@ -133,6 +132,7 @@ export class PageStructureService {
},
page: this.pageMetaData.get(),
});
+ // TODO CHANNELMGR-494: activate the mask. When/where to deactivate it? An
explicit signal from ExtJS would be nice.
}
printParsedElements() {
=====================================
frontend-ng/src/styles/_channel.scss
=====================================
--- /dev/null
+++ b/frontend-ng/src/styles/_channel.scss
@@ -0,0 +1,28 @@
+// 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.
+
+.mask {
+ height: 100%;
+ left: 0;
+ pointer-events: none;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 10;
+
+ &.disallowed {
+ pointer-events: auto;
+ cursor: not-allowed;
+ }
+}
\ No newline at end of file
=====================================
frontend-ng/src/styles/hippo-cm.scss
=====================================
--- a/frontend-ng/src/styles/hippo-cm.scss
+++ b/frontend-ng/src/styles/hippo-cm.scss
@@ -22,3 +22,4 @@
@import 'scale';
@import 'lists';
@import 'sidenav';
+@import 'channel';
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c0da8219ed2154e22946e40cbc8f1ed7beba1f3e
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
