X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=df7382f746fa276e3aab70f565451e5745361f69;hb=f944d2112f977ffe31545ceaee8a1ebeb1e128d8;hp=3a4fa5b1ed54ec06e5fe8ab198ea9c82a86ea3de;hpb=e45b7cd66b1f1fb573bc734584b6dc8348e67024;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 3a4fa5b..df7382f 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -286,6 +286,16 @@ mkws.log("Using window.name '" + window.name + "'");
 // wrapper to provide local copy of the jQuery object.
 (function($) {
   var log = mkws.log;
+  var _old2new = { // Maps old-style widget names to new-style
+    'Authname': 'auth-name',
+    'ConsoleBuilder': 'console-builder',
+    'Coverart': 'cover-art',
+    'GoogleImage': 'google-image',
+    'MOTD': 'motd',
+    'MOTDContainer': 'motd-container',
+    'Perpage': 'per-page',
+    'SearchForm': 'search-form',
+  };
 
   function handleNodeWithTeam(node, callback) {
     // First branch for DOM objects; second branch for jQuery objects
@@ -303,10 +313,15 @@ mkws.log("Using window.name '" + window.name + "'");
 
     for (var i = 0; i < list.length; i++) {
       var cname = list[i];
-      if (cname.match(/^mkwsTeam_/)) {
-        teamName = cname.replace(/^mkwsTeam_/, '');
+      if (cname.match(/^mkws-team-/)) {
+        teamName = cname.replace(/^mkws-team-/, '');
+      } else if (cname.match(/^mkws-/)) {
+        // New-style names of the form mkws-foo-bar
+        type = cname.replace(/^mkws-/, '');
       } else if (cname.match(/^mkws/)) {
-        type = cname.replace(/^mkws/, '');
+        // Old-style names of the form mkwsFooBar
+        var tmp = cname.replace(/^mkws/, '');
+        type = _old2new[tmp] || tmp;
       }
     }
 
@@ -353,8 +368,8 @@ mkws.log("Using window.name '" + window.name + "'");
       for (var tname in mkws.teams) {
         var team = mkws.teams[tname];
         team.visitWidgets(function(t, w) {
-          var w1 = team.widget(t + "-Container-" + from);
-          var w2 = team.widget(t + "-Container-" + to);
+          var w1 = team.widget(t + "-container-" + from);
+          var w2 = team.widget(t + "-container-" + to);
           if (w1) {
             w1.node.hide();
           }
@@ -443,9 +458,10 @@ mkws.log("Using window.name '" + window.name + "'");
       var s = "";
       for (var type in mkws.widgetType2function) {
 	if (s) s += ',';
-	s += '.mkws' + type;
-	s += ',.mkws' + type + "-Container-wide";
-	s += ',.mkws' + type + "-Container-narrow";
+	s += '.mkws-' + type;
+	s += ',.mkws-' + type + "-container-wide";
+	s += ',.mkws-' + type + "-container-narrow";
+        // ### Do we need to do something about old-style names?
       }
       return s;
     }