From 8212c51f8d1909a532d53838328850b77df57435 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Wed, 7 Nov 2018 09:01:29 +0100
Subject: [PATCH] js: Already set `window.name` prior bootstrapping our js
 runtime

Makes sure that the Window-Id already generated and utilized by the
server on the first request is used by subsequent requests instead
of a new one.

Also avoids that concurrent running id-less requests compete about
which one may set his assigned id. Now any subsequent request
already transmits the id assigned to the first one.

And it resets `window.name` in case the user performs a manual
refresh so that the id used by the server is set/utilized.

refs #3609
---
 application/layouts/scripts/layout.phtml | 1 +
 public/js/icinga/ui.js                   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index e64577cc2..44340da35 100644
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -85,6 +85,7 @@ $innerLayoutScript = $this->layout()->innerLayout . '.phtml';
 <script type="text/javascript" src="<?= $this->href($jsfile) ?>"></script>
 <!--<![endif]-->
 <script type="text/javascript">
+window.name = '<?= $this->protectId('Icinga') ?>';
 var icinga = new Icinga({
   baseUrl: '<?= $this->baseUrl(); ?>'
 });
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 31195351e..b0932621a 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -696,17 +696,17 @@
             if (! this.hasWindowId()) {
                 return undefined;
             }
-            return window.name.match(/^Icinga_([a-zA-Z0-9]+)$/)[1];
+            return window.name.match(/^Icinga-([a-zA-Z0-9]+)$/)[1];
         },
 
         hasWindowId: function () {
-            var res = window.name.match(/^Icinga_([a-zA-Z0-9]+)$/);
+            var res = window.name.match(/^Icinga-([a-zA-Z0-9]+)$/);
             return typeof res === 'object' && null !== res;
         },
 
         setWindowId: function (id) {
             this.icinga.logger.debug('Setting new window id', id);
-            window.name = 'Icinga_' + id;
+            window.name = 'Icinga-' + id;
         },
 
         destroy: function () {