From 7bec77fef02180dbd735b5dab193fb3c1d7c0ece Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Mon, 7 Jul 2014 14:04:51 +0100 Subject: [PATCH] Slight code-reordering to enable the next delta. --- src/mkws-core.js | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/mkws-core.js b/src/mkws-core.js index 1de1711..f90c759 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -6,23 +6,6 @@ "use strict"; // HTML5: disable for log_level >= 2 -// 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. We stash this 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 each tab gets its own session. -if (window.name) { - console.log("Using existing window.name '" + window.name + "'"); -} else { - // 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 - window.name = Math.random().toString(36).slice(2, 12); - console.log("Generated new window.name '" + window.name + "'"); -} - // Set up global mkws object. Contains truly global state such as SP // authentication, and a hash of team objects, indexed by team-name. // @@ -121,6 +104,24 @@ mkws.log = function(string) { }; +// 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. We stash this 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 each tab gets its own session. +if (window.name) { + console.log("Using existing window.name '" + window.name + "'"); +} else { + // 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 + window.name = Math.random().toString(36).slice(2, 12); + console.log("Generated new window.name '" + window.name + "'"); +} + + // Translation function. mkws.M = function(word) { var lang = mkws.config.lang; -- 1.7.10.4