projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We need to map old wigets names in more fucntions, MKWS-316
[mkws-moved-to-github.git]
/
src
/
mkws-core.js
diff --git
a/src/mkws-core.js
b/src/mkws-core.js
index
12fbcf4
..
0ae5a99
100644
(file)
--- a/
src/mkws-core.js
+++ b/
src/mkws-core.js
@@
-132,6
+132,11
@@
mkws.getParameterByName = function(name, url) {
mkws.registerWidgetType = function(name, fn) {
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 + "'");
};
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',
'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 = {};
};
// Annoyingly, there is no built-in way to invert a hash
var _new2old = {};
@@
-304,6
+310,8
@@
mkws.log("Using window.name '" + window.name + "'");
}
}
}
}
+ mkws._old2new = _old2new;
+
function handleNodeWithTeam(node, callback) {
// First branch for DOM objects; second branch for jQuery objects
var classes = node.className || node.attr('class');
function handleNodeWithTeam(node, callback) {
// First branch for DOM objects; second branch for jQuery objects
var classes = node.className || node.attr('class');
@@
-320,8
+328,15
@@
mkws.log("Using window.name '" + window.name + "'");
for (var i = 0; i < list.length; i++) {
var cname = list[i];
for (var i = 0; i < list.length; i++) {
var cname = list[i];
- if (cname.match(/^mkwsTeam_/)) {
+ 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_/, '');
teamName = cname.replace(/^mkwsTeam_/, '');
+ } else if (cname.match(/^mkws-/)) {
+ // 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/, '');
} else if (cname.match(/^mkws/)) {
// Old-style names of the form mkwsFooBar
var tmp = cname.replace(/^mkws/, '');
@@
-372,8
+387,8
@@
mkws.log("Using window.name '" + window.name + "'");
for (var tname in mkws.teams) {
var team = mkws.teams[tname];
team.visitWidgets(function(t, w) {
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();
}
if (w1) {
w1.node.hide();
}
@@
-486,7
+501,6
@@
mkws.log("Using window.name '" + window.name + "'");
var myTeam = mkws.teams[tname];
if (!myTeam) {
myTeam = mkws.teams[tname] = mkws.makeTeam($, tname);
var myTeam = mkws.teams[tname];
if (!myTeam) {
myTeam = mkws.teams[tname] = mkws.makeTeam($, tname);
- log("made MKWS team '" + tname + "'");
}
var oldHTML = this.innerHTML;
}
var oldHTML = this.innerHTML;
@@
-494,7
+508,7
@@
mkws.log("Using window.name '" + window.name + "'");
myTeam.addWidget(myWidget);
var newHTML = this.innerHTML;
if (newHTML !== oldHTML) {
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));
}
});
makeWidgetsWithin(level+1, $(this));
}
});
@@
-594,7
+608,7
@@
mkws.log("Using window.name '" + window.name + "'");
for (var tName in mkws.teams) {
var myTeam = mkws.teams[tName]
myTeam.makePz2();
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);
/*
myTeam.visitWidgets(function(t, w) {
log(" has widget of type '" + t + "': " + w);