kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
Merge branch '56-call-roster-is-now-labeled-gridtracker-and-contains-partial-layer-information' into 'master'
Resolve "Call Roster is now labeled "GridTracker" and contains partial layer information" Closes #56 See merge request gridtracker.org/gridtracker!55merge-requests/56/head
commit
e34823f87e
|
@ -430,8 +430,6 @@ function viewRoster()
|
|||
var onlyHits = false;
|
||||
var isAwardTracker = false;
|
||||
|
||||
document.title = window.opener.makeTitleInfo(false);
|
||||
|
||||
if (callMode == "hits")
|
||||
{
|
||||
callMode = "all";
|
||||
|
|
|
@ -82,6 +82,9 @@ 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")
|
||||
{
|
||||
|
@ -100,8 +103,16 @@ 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();
|
||||
// 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();
|
||||
}
|
||||
else
|
||||
{
|
||||
this.hide();
|
||||
}
|
||||
|
||||
g_initialScreenCount = nw.Screen.screens.length;
|
||||
setWindowInfo();
|
||||
|
|
Ładowanie…
Reference in New Issue