From be22915c0c6e482ae9d2c17779e6632cebc67d9d Mon Sep 17 00:00:00 2001 From: solvedDev Date: Tue, 6 Aug 2019 15:48:41 +0200 Subject: [PATCH] fixed update notification not appearing --- src/renderer/App.vue | 1 + src/renderer/scripts/plugins/Bridge.js | 10 ++++++---- src/renderer/store/modules/WindowFactory.js | 6 +++--- src/renderer/windows/UpdateApp.js | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 5b759de49..db5822f13 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -68,6 +68,7 @@ }, created() { SETTINGS.setup(); + new UpdateWindow(); }, computed: { is_sidebar_open() { diff --git a/src/renderer/scripts/plugins/Bridge.js b/src/renderer/scripts/plugins/Bridge.js index 073ca8538..308950e2d 100644 --- a/src/renderer/scripts/plugins/Bridge.js +++ b/src/renderer/scripts/plugins/Bridge.js @@ -233,21 +233,23 @@ export default class Bridge { this.Window = { register(window) { if(window.id === undefined) throw new Error("No window id defined."); - Store.commit("addPluginWindow", window); + Store.commit("addPluginWindow", { ...window, is_plugin: true }); }, update(window) { - Store.commit("updatePluginWindow", window); + Store.commit("updatePluginWindow", { ...window, is_plugin: true }); }, open(id) { Store.commit("setWindowIsVisible", { id, - val: true + val: true, + is_plugin: true }); }, close(id) { Store.commit("setWindowIsVisible", { id, - val: false + val: false, + is_plugin: true }); }, remove(id) { diff --git a/src/renderer/store/modules/WindowFactory.js b/src/renderer/store/modules/WindowFactory.js index 1facda1d4..a4a2c53ba 100644 --- a/src/renderer/store/modules/WindowFactory.js +++ b/src/renderer/store/modules/WindowFactory.js @@ -23,7 +23,7 @@ const mutations = { } if(i === state.elements.length) state.elements.push(detachObj({}, window)); - else if(id) throw new Error("Unknown window ID: " + id); + else if(window.id) throw new Error("Unknown window ID: " + window.id); }, updatePluginWindow(state, window) { @@ -36,7 +36,7 @@ const mutations = { let tmp = detachObj(state.elements[i], window); Vue.set(state.elements, i, tmp); } - else if(id) throw new Error("Unknown window ID: " + id); + else if(window.id) throw new Error("Unknown window ID: " + window.id); }, removePluginWindow(state, id) { let i = 0; @@ -55,7 +55,7 @@ const mutations = { if(state.elements.length > index && state.elements[index].id === id) state.elements.splice(index, 1); }, resetPluginWindows(state) { - state.elements = []; + state.elements = state.elements.filter(w => !w.is_plugin); } } diff --git a/src/renderer/windows/UpdateApp.js b/src/renderer/windows/UpdateApp.js index 525262367..695d74834 100644 --- a/src/renderer/windows/UpdateApp.js +++ b/src/renderer/windows/UpdateApp.js @@ -44,6 +44,7 @@ export default class UpdateWindow extends ContentWindow { fetch(WEB_APP_DATA + "app.json") .then(data => data.json()) .then(web_data => { + console.log(`Running bridge. ${APP_VERSION} | Latest: ${web_data.latest_version}`); if(VERSION_UTILS.lessThan(APP_VERSION, web_data.latest_version)) { this.content[4].text = `\n${web_data.latest_version} of bridge. is now available for download. Updates deliver new features for this editor and may include important bug fixes.\n\nPlease take the time to update bridge.!\n\n`; this.update({ is_visible: true, content: this.content }); @@ -71,6 +72,6 @@ export default class UpdateWindow extends ContentWindow { text: "" } ]; - this.update({ content: this.content }) + this.update({ content: this.content }); } } \ No newline at end of file