X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=e72d70c30fa7f90e40ce9445bbb373119bbe6534;hb=4e5ce53feabed663e304228da38c4548b76bfaca;hp=fc63469857e53f1d800015d70db7e20a973864b3;hpb=cea8956db8e8fb34da25915bbbab9622fb86cbdf;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index fc63469..e72d70c 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -295,6 +295,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,7 +305,6 @@ mkws.log("Using window.name '" + window.name + "'"); } } - function handleNodeWithTeam(node, callback) { // First branch for DOM objects; second branch for jQuery objects var classes = node.className || node.attr('class'); @@ -322,9 +322,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 @@ -490,7 +494,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 +501,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 +601,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);