X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=0ae5a996ae662a8f3c7925213b256ffb82d90972;hb=23bacc1691b42d9b2e131b7f47c9fcb2f72e3e6f;hp=36323afb3ffaf9034e971914a183da3ec415849f;hpb=033c287ec63e95848ef6b5f637b07cc20d5016db;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index 36323af..0ae5a99 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 + "'"); }; @@ -295,6 +300,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 +310,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,14 +329,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(); } } @@ -490,7 +501,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 +508,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 +608,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);