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

Layerable themes

Browse Source
This commit is contained in:
Mo Bitar
2018-07-18 20:58:18 -05:00
parent a1374b88ff
commit 57a140e272
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,14 +158,17 @@ class ComponentManager {
} }
} }
getActiveTheme() { getActiveThemes() {
return this.componentsForArea("themes").find((theme) => {return theme.active}); return this.componentsForArea("themes").filter((theme) => {return theme.active});
} }
postActiveThemeToComponent(component) { postActiveThemeToComponent(component) {
var activeTheme = this.getActiveTheme(); var themes = this.getActiveThemes();
var urls = themes.map((theme) => {
return this.urlForComponent(theme);
})
var data = { var data = {
themes: [activeTheme ? this.urlForComponent(activeTheme) : null] themes: urls
} }
this.sendMessageToComponent(component, {action: "themes", data: data}) this.sendMessageToComponent(component, {action: "themes", data: data})
@@ -586,11 +589,13 @@ class ComponentManager {
if(targetComponent.active) { if(targetComponent.active) {
this.deactivateComponent(targetComponent); this.deactivateComponent(targetComponent);
} else { } else {
if(targetComponent.content_type == "SN|Theme") { if(targetComponent.content_type == "SN|Theme" && !targetComponent.package_info.layerable) {
// Deactive currently active theme // Deactive currently active theme if new theme is not layerable
var activeTheme = this.getActiveTheme(); var activeThemes = this.getActiveThemes();
if(activeTheme) { for(var theme of activeThemes) {
this.deactivateComponent(activeTheme); if(theme && !theme.package_info.layerable) {
this.deactivateComponent(theme);
}
} }
} }
this.activateComponent(targetComponent); this.activateComponent(targetComponent);