diff --git a/app/assets/javascripts/app/controllers/footer.js b/app/assets/javascripts/app/controllers/footer.js index f0c37e9a8..15fcd07f2 100644 --- a/app/assets/javascripts/app/controllers/footer.js +++ b/app/assets/javascripts/app/controllers/footer.js @@ -138,20 +138,22 @@ angular.module('app') this.componentManager = componentManager; this.rooms = []; - this.themes = []; + this.themesWithIcons = []; modelManager.addItemSyncObserver("room-bar", "SN|Component", (allItems, validItems, deletedItems, source) => { this.rooms = modelManager.components.filter((candidate) => {return candidate.area == "rooms" && !candidate.deleted}); }); modelManager.addItemSyncObserver("footer-bar-themes", "SN|Theme", (allItems, validItems, deletedItems, source) => { - let themes = modelManager.validItemsForContentType("SN|Theme").filter((candidate) => {return !candidate.deleted}).sort((a, b) => { + let themes = modelManager.validItemsForContentType("SN|Theme").filter((candidate) => { + return !candidate.deleted && candidate.content.package_info.dock_icon; + }).sort((a, b) => { return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1; }); - let differ = themes.length != this.themes.length; + let differ = themes.length != this.themesWithIcons.length; - this.themes = themes; + this.themesWithIcons = themes; if(differ) { this.reloadDockShortcuts(); @@ -160,7 +162,7 @@ angular.module('app') this.reloadDockShortcuts = function() { let shortcuts = []; - for(var theme of this.themes) { + for(var theme of this.themesWithIcons) { var icon = theme.content.package_info.dock_icon; if(!icon) { continue; diff --git a/package.json b/package.json index c75637f8b..b221e7500 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "standard-notes-web", - "version": "3.0.0-beta1", + "version": "3.0.0-beta3", "license": "AGPL-3.0-or-later", "repository": { "type": "git", diff --git a/public/extensions/extensions-manager b/public/extensions/extensions-manager index 50a53c646..aa7682717 160000 --- a/public/extensions/extensions-manager +++ b/public/extensions/extensions-manager @@ -1 +1 @@ -Subproject commit 50a53c6469db7a92ddfe2562da09c8cacd7c9901 +Subproject commit aa76827177f5067ff5b115cb964900de0380c026