X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=6bb98b39f4c86720db37b5b6b438b31ea4ee0df6;hb=8b1e67064744864427ae995ebbb08819794891fa;hp=fc63469857e53f1d800015d70db7e20a973864b3;hpb=cea8956db8e8fb34da25915bbbab9622fb86cbdf;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index fc63469..6bb98b3 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -132,6 +132,11 @@ mkws.getParameterByName = function(name, url) {
 
 
 mkws.registerWidgetType = function(name, fn) {
+  if(mkws._old2new.hasOwnProperty(name)) {
+      mkws.log("Warning: registerWidgetType old widget name: " + name + " => " + mkws._old2new[name]);
+      name = mkws._old2new[name];
+  }
+
   mkws.widgetType2function[name] = fn;
   mkws.log("registered widget-type '" + name + "'");
 };
@@ -143,9 +148,7 @@ mkws.promotionFunction = function(name) {
 
 mkws.setMkwsConfig = function(overrides) {
   // Set global log_level flag early so that mkws.log() works
-  // Fall back to old "debug_level" setting for backwards compatibility
   var tmp = overrides.log_level;
-  if (typeof(tmp) === 'undefined') tmp = overrides.debug_level;
   if (typeof(tmp) !== 'undefined') mkws.log_level = tmp;
 
   var config_default = {
@@ -295,6 +298,7 @@ mkws.log("Using window.name '" + window.name + "'");
     'MOTDContainer': 'motd-container',
     'Perpage': 'per-page',
     'SearchForm': 'search-form',
+    'ReferenceUniverse': 'reference-universe'
   };
   // Annoyingly, there is no built-in way to invert a hash
   var _new2old = {};
@@ -304,6 +308,7 @@ mkws.log("Using window.name '" + window.name + "'");
     }
   }
 
+  mkws._old2new = _old2new;
 
   function handleNodeWithTeam(node, callback) {
     // First branch for DOM objects; second branch for jQuery objects
@@ -322,9 +327,13 @@ mkws.log("Using window.name '" + window.name + "'");
     for (var i = 0; i < list.length; i++) {
       var cname = list[i];
       if (cname.match(/^mkws-team-/)) {
+        // New-style teamnames of the form mkws-team-xyz
         teamName = cname.replace(/^mkws-team-/, '');
+      } else if (cname.match(/^mkwsTeam_/)) {
+        // Old-style teamnames of the form mkwsTeam_xyz
+        teamName = cname.replace(/^mkwsTeam_/, '');
       } else if (cname.match(/^mkws-/)) {
-        // New-style names of the form mkws-foo-bar
+        // New-style names of the from mkws-foo-bar
         type = cname.replace(/^mkws-/, '');
       } else if (cname.match(/^mkws/)) {
         // Old-style names of the form mkwsFooBar
@@ -338,7 +347,7 @@ mkws.log("Using window.name '" + window.name + "'");
       teamName = "AUTO";
       // Autosearch widgets don't join team AUTO if there is already an
       // autosearch on the team or the team has otherwise gotten a query
-      if (node.hasAttribute("autosearch")) {
+      if (node.getAttribute("autosearch")) {
         if (mkws.autoHasAuto ||
             mkws.teams["AUTO"] && mkws.teams["AUTO"].config["query"]) {
           log("AUTO team already has a query, using unique team");
@@ -490,7 +499,6 @@ mkws.log("Using window.name '" + window.name + "'");
         var myTeam = mkws.teams[tname];
         if (!myTeam) {
           myTeam = mkws.teams[tname] = mkws.makeTeam($, tname);
-          log("made MKWS team '" + tname + "'");
         }
 
         var oldHTML = this.innerHTML;
@@ -498,7 +506,7 @@ mkws.log("Using window.name '" + window.name + "'");
         myTeam.addWidget(myWidget);
         var newHTML = this.innerHTML;
         if (newHTML !== oldHTML) {
-          log("widget " + tname + ":" + type + " HTML changed: reparsing");
+          myTeam.log("widget " + type + " HTML changed: reparsing");
           makeWidgetsWithin(level+1, $(this));
         }
       });
@@ -598,7 +606,7 @@ mkws.log("Using window.name '" + window.name + "'");
     for (var tName in mkws.teams) {
       var myTeam = mkws.teams[tName]
       myTeam.makePz2();
-      log("made PZ2 object for team '" + tName + "'");
+      myTeam.log("made PZ2 object");
       /*
         myTeam.visitWidgets(function(t, w) {
           log("  has widget of type '" + t + "': " + w);