From f29a62013383b4b6982c7536c8921439a3dabf79 Mon Sep 17 00:00:00 2001 From: Tag Date: Sun, 10 Jan 2021 10:30:46 -0800 Subject: [PATCH 1/4] Removed title setting due to bug and not fully completed Call Roster is multi-instance aware, this needs to be re-thought. --- package.nw/lib/roster.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js index 9e1578b1..ecc95c3a 100644 --- a/package.nw/lib/roster.js +++ b/package.nw/lib/roster.js @@ -430,8 +430,6 @@ function viewRoster() var onlyHits = false; var isAwardTracker = false; - document.title = window.opener.makeTitleInfo(false); - if (callMode == "hits") { callMode = "all"; From c25b1a7be9a1f4da49eabd341a3fa093c29b6ec6 Mon Sep 17 00:00:00 2001 From: Tag Date: Sun, 10 Jan 2021 10:43:44 -0800 Subject: [PATCH 2/4] Fixed broken window save/restore --- package.nw/lib/screens.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package.nw/lib/screens.js b/package.nw/lib/screens.js index bc940f3a..5ee19eed 100644 --- a/package.nw/lib/screens.js +++ b/package.nw/lib/screens.js @@ -82,6 +82,7 @@ var g_isShowing = false; nw.Window.get().on("loaded", function () { + s_title = document.title.substr(0, 16).trim(); g_isShowing = false; if (typeof localStorage.screenSettings == "undefined") { @@ -100,8 +101,14 @@ nw.Window.get().on("loaded", function () g_isShowing = s_screenSettings[s_title].showing; nw.Window.get().zoomLevel = s_zoomLevel = s_screenSettings[s_title].zoomLevel; - if (g_isShowing || document.title == "GridTracker") this.show(); - else this.hide(); + if (g_isShowing || s_title.indexOf("GridTracker") == 0 ) + { + this.show(); + } + else + { + this.hide(); + } g_initialScreenCount = nw.Screen.screens.length; setWindowInfo(); From 7aade97f1b70c5d0747e51b17905a3ea487eb0c1 Mon Sep 17 00:00:00 2001 From: Tag Date: Sun, 10 Jan 2021 10:50:00 -0800 Subject: [PATCH 3/4] Comments added --- package.nw/lib/screens.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.nw/lib/screens.js b/package.nw/lib/screens.js index 5ee19eed..fd17ad14 100644 --- a/package.nw/lib/screens.js +++ b/package.nw/lib/screens.js @@ -82,6 +82,8 @@ var g_isShowing = false; nw.Window.get().on("loaded", function () { + // Use the first 16 bytes of the title(trimmed) as storage names + // This cannot be changed as current installs (12,000+) use this naming convention s_title = document.title.substr(0, 16).trim(); g_isShowing = false; if (typeof localStorage.screenSettings == "undefined") @@ -101,6 +103,8 @@ nw.Window.get().on("loaded", function () g_isShowing = s_screenSettings[s_title].showing; nw.Window.get().zoomLevel = s_zoomLevel = s_screenSettings[s_title].zoomLevel; + // Check the first part of the string, only one window has "GridTracker" in the name. + // It is reserved to the main app window. if (g_isShowing || s_title.indexOf("GridTracker") == 0 ) { this.show(); From c19978f89828b3c02a0cfc3933a51d4c48ae9c8a Mon Sep 17 00:00:00 2001 From: Tag Date: Sun, 10 Jan 2021 12:36:06 -0800 Subject: [PATCH 4/4] eslint fixup --- package.nw/lib/screens.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.nw/lib/screens.js b/package.nw/lib/screens.js index fd17ad14..fca7d4dc 100644 --- a/package.nw/lib/screens.js +++ b/package.nw/lib/screens.js @@ -82,7 +82,7 @@ var g_isShowing = false; nw.Window.get().on("loaded", function () { - // Use the first 16 bytes of the title(trimmed) as storage names + // Use the first 16 bytes of the title(trimmed) as storage names // This cannot be changed as current installs (12,000+) use this naming convention s_title = document.title.substr(0, 16).trim(); g_isShowing = false; @@ -105,11 +105,11 @@ nw.Window.get().on("loaded", function () // Check the first part of the string, only one window has "GridTracker" in the name. // It is reserved to the main app window. - if (g_isShowing || s_title.indexOf("GridTracker") == 0 ) + if (g_isShowing || s_title.indexOf("GridTracker") == 0) { this.show(); } - else + else { this.hide(); }