X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=de5895d5f600399b0ee53943a2a72f9086dea4ec;hb=9414c1ffb05c80a52d0ab39ee13889276c5a5a04;hp=325de02fe0181fd6885fde9d619f4ceebaf0a18a;hpb=950c995e759d65d8dd4e9fc11383d4ed269b35bd;p=mkws-moved-to-github.git
diff --git a/src/mkws-core.js b/src/mkws-core.js
index 325de02..de5895d 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -6,6 +6,23 @@
"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.
//
@@ -249,6 +266,14 @@ mkws.defaultTemplate = function(name) {
{{#if md-title-responsibility}}\
{{md-title-responsibility}}\
{{/if}}\
+{{#if md-date}}, {{md-date}}\
+{{#if location}}\
+, {{#mkws-first location}}{{mkws-attr "@name"}}{{/mkws-first}}\
+{{/if}}\
+{{#if md-medium}}\
+, {{md-medium}}\
+{{/if}}\
+{{/if}}\
';
} else if (name === "Image") {
return '\
@@ -261,14 +286,16 @@ mkws.defaultTemplate = function(name) {
';
} else if (name === 'Facet') {
return '\
-{{term}}\
+{{term}}\
{{count}}\
';
}
- var s = "There is no default '" + name +"' template!";
- alert(s);
- return s;
+ return null;
};