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

diff --git a/src/mkws-core.js b/src/mkws-core.js
index df7382f..56e7f28 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -296,6 +296,13 @@ mkws.log("Using window.name '" + window.name + "'");
     'Perpage': 'per-page',
     'SearchForm': 'search-form',
   };
+  // Annoyingly, there is no built-in way to invert a hash
+  var _new2old = {};
+  for (var key in _old2new) {
+    if(_old2new.hasOwnProperty(key)) {
+      _new2old[_old2new[key]] = key;
+    }
+  }
 
   function handleNodeWithTeam(node, callback) {
     // First branch for DOM objects; second branch for jQuery objects
@@ -314,14 +321,18 @@ 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
         var tmp = cname.replace(/^mkws/, '');
-        type = _old2new[tmp] || tmp;
+        type = _old2new[tmp] || tmp.toLowerCase();
       }
     }
 
@@ -461,7 +472,11 @@ mkws.log("Using window.name '" + window.name + "'");
 	s += '.mkws-' + type;
 	s += ',.mkws-' + type + "-container-wide";
 	s += ',.mkws-' + type + "-container-narrow";
-        // ### Do we need to do something about old-style names?
+        // Annoyingly, we also need to recognise old-style names
+        var oldtype = _new2old[type] || type.charAt(0).toUpperCase() + type.slice(1);
+	s += ',.mkws' + oldtype;
+	s += ',.mkws' + oldtype + "-Container-wide";
+	s += ',.mkws' + oldtype + "-Container-narrow";
       }
       return s;
     }