X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=509fc2ff63febbecfdb96014cd17ab4ab0444acd;hb=8d1d4b22649401af52cfc1f1ba65d9627a149b15;hp=0825553bb57af58563fa08bbaed111d969756689;hpb=f944d2112f977ffe31545ceaee8a1ebeb1e128d8;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index 0825553..509fc2f 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -185,7 +185,7 @@ mkws.makeTeam = function($, teamName) { } m_paz = new pz2(params); - log("ccreated main pz2 object"); + log("created main pz2 object"); } @@ -340,10 +340,10 @@ mkws.makeTeam = function($, teamName) { // switching view between targets and records function switchView(view) { - var targets = widgetNode('Targets'); - var results = widgetNode('Results') || widgetNode('Records'); - var blanket = widgetNode('Blanket'); - var motd = widgetNode('MOTD'); + var targets = widgetNode('targets'); + var results = widgetNode('results') || widgetNode('records'); + var blanket = widgetNode('blanket'); + var motd = widgetNode('motd'); switch(view) { case 'targets': @@ -391,7 +391,7 @@ mkws.makeTeam = function($, teamName) { if (teamName === 'AUTO') { selector = (selector + '.mkws-team-' + teamName + ',' + - selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"],[class^="mkws-team-"],[class*=" mkws-team-"])'); + selector + ':not([class^="mkws-team"],[class*=" mkws-team"])'); } else { selector = selector + '.mkws-team-' + teamName; } @@ -410,7 +410,7 @@ mkws.makeTeam = function($, teamName) { function renderDetails(data, marker) { var template = loadTemplate("Record"); var details = template(data); - return '
' + details + '
'; } that.renderDetails = renderDetails; @@ -425,7 +425,13 @@ mkws.makeTeam = function($, teamName) { var template = m_template[name]; if (template === undefined && Handlebars.compile) { var source; - var node = $(".mkws-template_" + name + " .mkws-team-" + that.name()); + var node = $(".mkws-template-" + name + " .mkws-team-" + that.name()); + if (node && node.length < 1) { + node = $(".mkws-template-" + name); + } + if (node && node.length < 1) { + node = $(".mkws-template_" + name + " .mkws-team-" + that.name()); + } if (node && node.length < 1) { node = $(".mkws-template_" + name); } @@ -438,7 +444,7 @@ mkws.makeTeam = function($, teamName) { } //if (template === undefined) template = mkws_templatesbyteam[m_teamName][name]; if (template === undefined && Handlebars.templates) { - template = Handlebars.templates[name]; + template = Handlebars.templates["mkws-template-" + name]; } if (template === undefined && mkws.defaultTemplates) { template = mkws.defaultTemplates[name]; @@ -448,7 +454,7 @@ mkws.makeTeam = function($, teamName) { return template; } else { - mkws.log("No MKWS template for " + name); + log("No MKWS template for " + name); return null; } }