Merge branch 'broken-copyright' into 'master'

Tag's copyright changes broke the app!

See merge request gridtracker.org/gridtracker!52
merge-requests/53/merge
Matthew Chambers 2021-01-08 15:16:07 +00:00
commit 3107a277c6
3 zmienionych plików z 21 dodań i 22 usunięć

Wyświetl plik

@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
Copyright (c) 2018-2021 GridTricker.org
GridTracker Copyright © 2018-2021 GridTracker.org
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -1747,8 +1747,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
</div>
<div class="mapItem" id="QSOgridDiv" >
<table align="center">
<tr align="center">
@ -1760,7 +1760,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
</div>
<div class="mapItem" id="QSLgridDiv" >
<table align="center">
<tr align="center">
@ -1772,7 +1772,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
</div>
<div class="mapItem" id="QSXgridDiv" >
<table align="center">
<tr align="center">
@ -1785,7 +1785,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</tr>
</table>
</div>
<br />
<br />
<div class="mapItem" id="CQgridDiv" >
<table align="center">
<tr align="center">
@ -1797,8 +1797,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
</div>
<div class="mapItem" id="CQDXgridDiv" >
<table align="center">
<tr align="center">
@ -1810,7 +1810,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
</div>
<div class="mapItem" id="QRZgridDiv" >
<table align="center">
<tr align="center">
@ -1822,7 +1822,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
</div>
<div class="mapItem" id="QTHgridDiv" >
<table align="center">
<tr align="center">
@ -1834,10 +1834,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
</div>
</div>
<br />
<br />
<div class="mapItem">
@ -1851,7 +1851,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
</div>
<div class="mapItem">
<table align="center">
<tr>
@ -1875,7 +1875,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
</div>
<div class="mapItem">
<table align="center">
<tr>
@ -1887,7 +1887,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
</div>
<div class="mapItem">
<table align="center">
<tr>
@ -1899,8 +1899,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</td>
</tr>
</table>
</div>
<br/>
</div>
<br/>
<div class="mapItem" id="decayRateDiv">
<table align="center">
<tr align="center">
@ -2212,7 +2212,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</tr>
</table>
</div>
<br />
<br />
<div class="mapItem" id="spotPathWidthDiv">
<table align="center">
<tr>

Wyświetl plik

@ -1,4 +1,4 @@
// GridTracker ©2021 GridTracker.org
// GridTracker Copyright © 2021 GridTracker.org
// All rights reserved.
// See LICENSE for more information.
const pjson = require("./package.json");

Wyświetl plik

@ -82,7 +82,6 @@ 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")
{
@ -101,7 +100,7 @@ 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 || s_title == "GridTracker ©202") this.show();
if (g_isShowing || document.title == "GridTracker") this.show();
else this.hide();
g_initialScreenCount = nw.Screen.screens.length;