rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Theme layerable func

Browse Source
This commit is contained in:
Mo Bitar
2018-07-20 19:47:57 -05:00
parent 8a8d37dd43
commit a8d59700ed
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/app/services/componentManager.js
View File

@@ -594,11 +594,11 @@ class ComponentManager {
if(targetComponent.active) { if(targetComponent.active) {
this.deactivateComponent(targetComponent); this.deactivateComponent(targetComponent);
} else { } else {
if(targetComponent.content_type == "SN|Theme" && !targetComponent.package_info.layerable) { if(targetComponent.content_type == "SN|Theme" && !targetComponent.isLayerable()) {
// Deactive currently active theme if new theme is not layerable // Deactive currently active theme if new theme is not layerable
var activeThemes = this.getActiveThemes(); var activeThemes = this.getActiveThemes();
for(var theme of activeThemes) { for(var theme of activeThemes) {
if(theme && !theme.package_info.layerable) { if(theme && !theme.isLayerable()) {
this.deactivateComponent(theme); this.deactivateComponent(theme);
} }
} }

2
package.json
View File

@@ -38,7 +38,7 @@
"karma-phantomjs-launcher": "^1.0.2", "karma-phantomjs-launcher": "^1.0.2",
"sn-stylekit": "1.0.15", "sn-stylekit": "1.0.15",
"standard-file-js": "file:~/Desktop/sf/sfjs", "standard-file-js": "file:~/Desktop/sf/sfjs",
"sn-models": "0.1.0", "sn-models": "0.1.1",
"connect": "^3.6.6", "connect": "^3.6.6",
"mocha": "^5.2.0", "mocha": "^5.2.0",
"serve-static": "^1.13.2", "serve-static": "^1.13.2",