From b3a2649ce0ebccdfee0cb123ad29be0ead54c06b Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Fri, 3 Oct 2014 17:03:59 +0100 Subject: [PATCH] Move window.name assignment down after all the function definitions. --- src/mkws-core.js | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/mkws-core.js b/src/mkws-core.js index d8ca560..e6ddd88 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,35 @@ mkws.pazpar2_url = function() { }; +// 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 + "'"); +} + + // wrapper to provide local copy of the jQuery object. (function($) { var log = mkws.log; -- 1.7.10.4