From: Mike Taylor <mike@indexdata.com>
Date: Mon, 20 Oct 2014 10:29:56 +0000 (+0100)
Subject: Merge
X-Git-Tag: 1.0.0~155^2~7
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=d7f7e11af10210fd9872cedc1489fe0b692ca589;hp=-c

Merge
---

d7f7e11af10210fd9872cedc1489fe0b692ca589
diff --combined src/mkws-core.js
index fc63469,3a4fa5b..12fbcf4
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@@ -286,25 -286,7 +286,24 @@@ mkws.log("Using window.name '" + window
  // wrapper to provide local copy of the jQuery object.
  (function($) {
    var log = mkws.log;
 +  var _old2new = { // Maps old-style widget names to new-style
 +    'Authname': 'auth-name',
 +    'ConsoleBuilder': 'console-builder',
 +    'Coverart': 'cover-art',
 +    'GoogleImage': 'google-image',
 +    'MOTD': 'motd',
 +    'MOTDContainer': 'motd-container',
 +    'Perpage': 'per-page',
 +    'SearchForm': 'search-form',
 +  };
 +  // Annoyingly, there is no built-in way to invert a hash
 +  var _new2old = {};
 +  for (var key in _old2new) {
 +    if(_old2new.hasOwnProperty(key)) {
 +      _new2old[_old2new[key]] = key;
 +    }
 +  }
  
- 
    function handleNodeWithTeam(node, callback) {
      // First branch for DOM objects; second branch for jQuery objects
      var classes = node.className || node.attr('class');
@@@ -321,15 -303,10 +320,12 @@@
  
      for (var i = 0; i < list.length; i++) {
        var cname = list[i];
-       if (cname.match(/^mkws-team-/)) {
-         teamName = cname.replace(/^mkws-team-/, '');
-       } else if (cname.match(/^mkws-/)) {
-         // New-style names of the form mkws-foo-bar
-         type = cname.replace(/^mkws-/, '');
+       if (cname.match(/^mkwsTeam_/)) {
+         teamName = cname.replace(/^mkwsTeam_/, '');
        } else if (cname.match(/^mkws/)) {
 -        type = cname.replace(/^mkws/, '');
 +        // Old-style names of the form mkwsFooBar
 +        var tmp = cname.replace(/^mkws/, '');
 +        type = _old2new[tmp] || tmp.toLowerCase();
        }
      }
  
@@@ -376,8 -353,8 +372,8 @@@
        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();
            }
@@@ -466,14 -443,9 +462,14 @@@
        var s = "";
        for (var type in mkws.widgetType2function) {
  	if (s) s += ',';
 -	s += '.mkws' + type;
 -	s += ',.mkws' + type + "-Container-wide";
 -	s += ',.mkws' + type + "-Container-narrow";
 +	s += '.mkws-' + type;
 +	s += ',.mkws-' + type + "-container-wide";
 +	s += ',.mkws-' + type + "-container-narrow";
 +        // Annoyingly, we also need to recognise old-style names
 +        var oldtype = _new2old[type] || type.charAt(0).toUpperCase() + type.slice(1);
 +	s += ',.mkws' + oldtype;
 +	s += ',.mkws' + oldtype + "-Container-wide";
 +	s += ',.mkws' + oldtype + "-Container-narrow";
        }
        return s;
      }
diff --combined src/mkws-team.js
index ad0c77e,0879add..2cc27c0
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@@ -191,13 -191,13 +191,13 @@@ mkws.makeTeam = function($, teamName) 
  
    // Used by the Records widget and onRecord()
    function recordElementId(s) {
-     return 'mkws-rec_' + s.replace(/[^a-z0-9]/ig, '_');
+     return 'mkwsRec_' + s.replace(/[^a-z0-9]/ig, '_');
    }
    that.recordElementId = recordElementId;
  
    // Used by onRecord(), showDetails() and renderDetails()
    function recordDetailsId(s) {
-     return 'mkws-det_' + s.replace(/[^a-z0-9]/ig, '_');
+     return 'mkwsDet_' + s.replace(/[^a-z0-9]/ig, '_');
    }
  
  
@@@ -340,10 -340,10 +340,10 @@@
  
    // 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':
@@@ -390,10 -390,10 +390,10 @@@
      teamName = teamName || m_teamName;
  
      if (teamName === 'AUTO') {
-       selector = (selector + '.mkws-team-' + teamName + ',' +
-                   selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"],[class^="mkws-team-"],[class*=" mkws-team-"])');
+       selector = (selector + '.mkwsTeam_' + teamName + ',' +
+                   selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"])');
      } else {
-       selector = selector + '.mkws-team-' + teamName;
+       selector = selector + '.mkwsTeam_' + teamName;
      }
  
      var node = $(selector);
@@@ -410,7 -410,7 +410,7 @@@
    function renderDetails(data, marker) {
      var template = loadTemplate("Record");
      var details = template(data);
-     return '<div class="mkws-details mkws-team-' + m_teamName + '" ' +
+     return '<div class="mkwsDetails mkwsTeam_' + m_teamName + '" ' +
        'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
    }
    that.renderDetails = renderDetails;
@@@ -425,9 -425,9 +425,9 @@@
      var template = m_template[name];
      if (template === undefined && Handlebars.compile) {
        var source;
-       var node = $(".mkws-template_" + name + " .mkws-team-" + that.name());
+       var node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name());
        if (node && node.length < 1) {
-         node = $(".mkws-template_" + name);
+         node = $(".mkwsTemplate_" + name);
        }
        if (node) source = node.html();
        if (!source) source = m_templateText[name];