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
Forgot '@' in @last
[mkws-moved-to-github.git]
/
src
/
mkws-team.js
diff --git
a/src/mkws-team.js
b/src/mkws-team.js
index
bbeeb70
..
7ec9c2f
100644
(file)
--- a/
src/mkws-team.js
+++ b/
src/mkws-team.js
@@
-191,13
+191,13
@@
mkws.makeTeam = function($, teamName) {
// Used by the Records widget and onRecord()
function recordElementId(s) {
// Used by the Records widget and onRecord()
function recordElementId(s) {
- return 'mkwsRec_' + s.replace(/[^a-z0-9]/ig, '_');
+ return 'mkws-rec_' + s.replace(/[^a-z0-9]/ig, '_');
}
that.recordElementId = recordElementId;
// Used by onRecord(), showDetails() and renderDetails()
function recordDetailsId(s) {
}
that.recordElementId = recordElementId;
// Used by onRecord(), showDetails() and renderDetails()
function recordDetailsId(s) {
- return 'mkwsDet_' + s.replace(/[^a-z0-9]/ig, '_');
+ return 'mkws-det_' + s.replace(/[^a-z0-9]/ig, '_');
}
}
@@
-390,10
+390,10
@@
mkws.makeTeam = function($, teamName) {
teamName = teamName || m_teamName;
if (teamName === 'AUTO') {
teamName = teamName || m_teamName;
if (teamName === 'AUTO') {
- selector = (selector + '.mkwsTeam_' + teamName + ',' +
- selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"])');
+ selector = (selector + '.mkws-team-' + teamName + ',' +
+ selector + ':not([class^="mkws-team"],[class*=" mkws-team"])');
} else {
} else {
- selector = selector + '.mkwsTeam_' + teamName;
+ selector = selector + '.mkws-team-' + teamName;
}
var node = $(selector);
}
var node = $(selector);
@@
-408,20
+408,29
@@
mkws.makeTeam = function($, teamName) {
}
function renderDetails(data, marker) {
}
function renderDetails(data, marker) {
- var template = loadTemplate("Record");
+ var template = loadTemplate("details");
var details = template(data);
var details = template(data);
- return '<div class="mkwsDetails mkwsTeam_' + m_teamName + '" ' +
+ return '<div class="mkws-details mkwsDetails mkwsTeam_' + m_teamName + '" ' +
'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
}
that.renderDetails = renderDetails;
that.registerTemplate = function(name, text) {
'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
}
that.renderDetails = renderDetails;
that.registerTemplate = function(name, text) {
+ if(mkws._old2new.hasOwnProperty(name)) {
+ mkws.log("Warning: registerTemplate old widget name: " + name + " => " + mkws._old2new[name]);
+ name = mkws._old2new[name];
+ }
m_templateText[name] = text;
};
function loadTemplate(name, fallbackString) {
m_templateText[name] = text;
};
function loadTemplate(name, fallbackString) {
+ if(mkws._old2new.hasOwnProperty(name)) {
+ mkws.log("Warning loadTemplate: old widget name: " + name + " => " + mkws._old2new[name]);
+ name = mkws._old2new[name];
+ }
+
var template = m_template[name];
if (template === undefined && Handlebars.compile) {
var source;
var template = m_template[name];
if (template === undefined && Handlebars.compile) {
var source;
@@
-429,12
+438,6
@@
mkws.makeTeam = function($, teamName) {
if (node && node.length < 1) {
node = $(".mkws-template-" + name);
}
if (node && node.length < 1) {
node = $(".mkws-template-" + name);
}
- if (node && node.length < 1) {
- node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name());
- }
- if (node && node.length < 1) {
- node = $(".mkwsTemplate_" + name);
- }
if (node) source = node.html();
if (!source) source = m_templateText[name];
if (source) {
if (node) source = node.html();
if (!source) source = m_templateText[name];
if (source) {