X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=d88e751f6b32415481f936a93e7822657c2f20c5;hb=8abb8fd5799c2c161f04fa622f1df2617953d480;hp=d8ca560b6a6abd7cf4b0f28cddef377cae2fa899;hpb=9044b6413fbc87b25dded1f1ecd32f4b6b971a77;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index d8ca560..d88e751 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -109,35 +109,6 @@ mkws.log = function(string) {
 };
 
 
-// We put a session ID in window.name, as it's the only place to keep
-// data that is preserved across reloads and within-site navigation.
-// pz2.js picks this up and uses it as part of the cookie-name, to
-// ensure we get a new session when we need one.
-//
-// We want to use different sessions for different windows/tabs (so
-// they don't receive each other's messages), different hosts and
-// different paths on a host (since in general these will
-// authenticate as different libraries). So the window name needs to
-// include a session identifier, the hostname and the path from the
-// URL.
-//
-if (window.name) {
-  mkws.log("Using existing window.name '" + window.name + "'");
-} else {
-  // Incredible that the standard JavaScript runtime doesn't define a
-  // unique windowId. Instead, we have to make one up. And since there's
-  // no global area shared between windows, the best we can do for
-  // ensuring uniqueness is generating a random ID and crossing our
-  // fingers.
-  //
-  // Ten chars from 26 alpha-numerics = 36^10 = 3.65e15 combinations.
-  // At one per second, it will take 116 million years to duplicate a session
-  var session = Math.random().toString(36).slice(2, 12);
-  window.name = window.location.hostname + window.location.pathname + '/' + session;
-  mkws.log("Generated new window.name '" + window.name + "'");
-}
-
-
 // Translation function.
 mkws.M = function(word) {
   var lang = mkws.config.lang;
@@ -280,6 +251,38 @@ mkws.pazpar2_url = function() {
 };
 
 
+// We put a session token in window.name, as it's the only place to
+// keep data that is preserved across reloads and within-site
+// navigation. pz2.js picks this up and uses it as part of the
+// cookie-name, to ensure we get a new session when we need one.
+//
+// We want to use different sessions for different windows/tabs (so
+// they don't receive each other's messages), different hosts and
+// different paths on a host (since in general these will
+// authenticate as different libraries). So the window name needs to
+// include the hostname and the path from the URL, plus the token.
+//
+var token;
+if (window.name) {
+  token = window.name.replace(/.*\//, '');
+  mkws.log("Reusing existing window token '" + token + "'");
+} else {
+  // Incredible that the standard JavaScript runtime doesn't define a
+  // unique windowId. Instead, we have to make one up. And since there's
+  // no global area shared between windows, the best we can do for
+  // ensuring uniqueness is generating a random ID and crossing our
+  // fingers.
+  //
+  // Ten chars from 26 alpha-numerics = 36^10 = 3.65e15 combinations.
+  // At one per second, it will take 116 million years to duplicate a token
+  token = Math.random().toString(36).slice(2, 12);
+  mkws.log("Generated new window token '" + token + "'");
+}
+
+window.name = window.location.hostname + window.location.pathname + '/' + token;
+mkws.log("Using window.name '" + window.name + "'");
+
+
 // wrapper to provide local copy of the jQuery object.
 (function($) {
   var log = mkws.log;