From 36f986a35ffc93d754bb32471a7a968519a0fc9d Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Sun, 14 Apr 2019 09:30:19 -0500 Subject: [PATCH] Reload extensions data when Extensions manager becomes available --- app/assets/javascripts/app/controllers/footer.js | 14 ++++++++++++-- .../templates/directives/component-view.html.haml | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/controllers/footer.js b/app/assets/javascripts/app/controllers/footer.js index 3bf6a2c1a..057244550 100644 --- a/app/assets/javascripts/app/controllers/footer.js +++ b/app/assets/javascripts/app/controllers/footer.js @@ -65,12 +65,18 @@ angular.module('app') } $rootScope.$on("reload-ext-data", () => { + this.reloadExtendedData(); + }); + + this.reloadExtendedData = () => { if(this.reloadInProgress) { return; } this.reloadInProgress = true; // A reload occurs when the extensions manager window is opened. We can close it after a delay let extWindow = this.rooms.find((room) => {return room.package_info.identifier == nativeExtManager.extensionsManagerIdentifier}); if(!extWindow) { + this.queueExtReload = true; // try again when the ext is available + this.reloadInProgress = false; return; } @@ -80,8 +86,8 @@ angular.module('app') this.selectRoom(extWindow); this.reloadInProgress = false; $rootScope.$broadcast("ext-reload-complete"); - }, 2000) - }); + }, 2000); + } this.getUser = function() { return authManager.user; @@ -182,6 +188,10 @@ angular.module('app') modelManager.addItemSyncObserver("room-bar", "SN|Component", (allItems, validItems, deletedItems, source) => { this.rooms = modelManager.components.filter((candidate) => {return candidate.area == "rooms" && !candidate.deleted}); + if(this.queueExtReload) { + this.queueExtReload = false; + this.reloadExtendedData(); + } }); modelManager.addItemSyncObserver("footer-bar-themes", "SN|Theme", (allItems, validItems, deletedItems, source) => { diff --git a/app/assets/templates/directives/component-view.html.haml b/app/assets/templates/directives/component-view.html.haml index 76a829ede..ef24cddd9 100644 --- a/app/assets/templates/directives/component-view.html.haml +++ b/app/assets/templates/directives/component-view.html.haml @@ -38,7 +38,7 @@ .sk-app-bar-item .sk-app-bar-item-column .sk-button.warning - %a.sk-label{"href" => "https://standardnotes.org/help", "target" => "_blank", "rel" => "noopener"} Help + %a.sk-label{"href" => "https://standardnotes.org/help/41/expired", "target" => "_blank", "rel" => "noopener"} Help .sn-component{"ng-if" => "error == 'offline-restricted'"} .sk-panel.static