Merge remote-tracking branch 'origin/master' into mkws-294

diff --combined src/mkws-popup.js
index 74886ff,48e375a..7cc3792
--- 1/src/mkws-popup.js
--- 2/src/mkws-popup.js
+++ b/src/mkws-popup.js
@@@ -6,11 -6,11 +6,11 @@@
  // $(document).ready(function () {
  mkws.registerWidgetType('popup', function() {
      var $ = mkws.$;
-     var debug = mkws.log;
+     var debug = this.log;
      debug("init popup window");
  
      var popup_window = $(this.node);
 -    // var popup_window = $(".mkwsPopup"); // $(document).ready()
 +    // var popup_window = $(".mkws-popup mkwsPopup"); // $(document).ready()
      if (!popup_window) {
          debug("no popup found, skip...");
          return;
@@@ -49,7 -49,7 +49,7 @@@
              close: function() {}
          });
  
 -        // open at search query submit: "input.mkwsButton"
 +        // open at search query submit: "input.mkws-button mkwsButton"
          var id_botton = that.attr("popup_button");
          if (id_botton) {
              $(id_botton).button().click(function() {

diff --combined src/mkws-team.js
index 415ff79,bbeeb70..509fc2f
--- 1/src/mkws-team.js
--- 2/src/mkws-team.js
+++ b/src/mkws-team.js
@@@ -185,19 -185,19 +185,19 @@@ mkws.makeTeam = function($, teamName) 
      }
  
      m_paz = new pz2(params);
-     log("ccreated main pz2 object");
+     log("created main pz2 object");
    }
  
  
    // 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) {
 -    return 'mkwsDet_' + s.replace(/[^a-z0-9]/ig, '_');
 +    return 'mkws-det_' + s.replace(/[^a-z0-9]/ig, '_');
    }
  
  
@@@ -390,10 -390,10 +390,10 @@@
      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 {
 -      selector = selector + '.mkwsTeam_' + teamName;
 +      selector = selector + '.mkws-team-' + 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="mkwsDetails mkwsTeam_' + m_teamName + '" ' +
 +    return '<div class="mkws-details mkwsDetails mkwsTeam_' + m_teamName + '" ' +
        'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
    }
    that.renderDetails = renderDetails;
@@@ -430,10 -430,10 +430,10 @@@
          node = $(".mkws-template-" + name);
        }
        if (node && node.length < 1) {
 -        node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name());
 +        node = $(".mkws-template_" + name + " .mkws-team-" + that.name());
        }
        if (node && node.length < 1) {
 -        node = $(".mkwsTemplate_" + name);
 +        node = $(".mkws-template_" + name);
        }
        if (node) source = node.html();
        if (!source) source = m_templateText[name];
@@@ -454,7 -454,7 +454,7 @@@
        return template;
      }
      else {
-       mkws.log("No MKWS template for " + name);
+       log("No MKWS template for " + name);
        return null;
      }  
    }