Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 0bfc174..e08958f 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -88,7 +88,8 @@ mkws.log = function(string) {
 
     // you need to disable use strict at the top of the file!!!
     if (mkws.log_level >= 3) {
-       console.log(arguments.callee.caller);
+        // Works in Chrome; not sure about elsewhere
+       console.trace();
     } else if (mkws.log_level >= 2) {
        console.log(">>> called from function " + arguments.callee.caller.name + ' <<<');
     }

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 8f4235e..6010abb 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -356,45 +356,6 @@ function team($, teamName) {
        if (m_config.show_lang)
            mkwsHtmlLang();
 
-       log("HTML records");
-       // If the team has a .mkwsResults, populate it in the usual
-       // way. If not, assume that it's a smarter application that
-       // defines its own subcomponents, some or all of the
-       // following:
-       //      .mkwsTermlists
-       //      .mkwsRanking
-       //      .mkwsPager
-       //      .mkwsNavi
-       //      .mkwsRecords
-       findnode(".mkwsResults").html('\
-<table width="100%" border="0" cellpadding="6" cellspacing="0">\
-  <tr>\
-    <td class="mkwsTermlistContainer1 mkwsTeam_' + m_teamName + '" width="250" valign="top">\
-      <div class="mkwsTermlists mkwsTeam_' + m_teamName + '"></div>\
-    </td>\
-    <td class="mkwsMOTDContainer mkwsTeam_' + m_teamName + '" valign="top">\
-      <div class="mkwsRanking mkwsTeam_' + m_teamName + '"></div>\
-      <div class="mkwsPager mkwsTeam_' + m_teamName + '"></div>\
-      <div class="mkwsNavi mkwsTeam_' + m_teamName + '"></div>\
-      <div class="mkwsRecords mkwsTeam_' + m_teamName + '"></div>\
-    </td>\
-  </tr>\
-  <tr>\
-    <td colspan="2">\
-      <div class="mkwsTermlistContainer2 mkwsTeam_' + m_teamName + '"></div>\
-    </td>\
-  </tr>\
-</table>');
-
-       var acc = [];
-       var facets = m_config.facets;
-       acc.push('<div class="title">' + M('Termlists') + '</div>');
-       for (var i = 0; i < facets.length; i++) {
-           acc.push('<div class="mkwsFacet mkwsTeam_' + m_teamName + '" data-mkws-facet="' + facets[i] + '">');
-           acc.push('</div>');
-       }
-       findnode(".mkwsTermlists").html(acc.join(''));
-
        var ranking_data = '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
        if (m_config.show_sort) {
            ranking_data +=  M('Sort by') + ' ' + mkwsHtmlSort() + ' ';
@@ -405,11 +366,6 @@ function team($, teamName) {
         ranking_data += '</form>';
        findnode(".mkwsRanking").html(ranking_data);
 
-       // on first page, hide the termlist
-       $(document).ready(function() {
-            var t = widgetNode("Termlists");
-            if (t) t.hide();
-        });
         var container = findnode(".mkwsMOTDContainer");
        if (container.length) {
            // Move the MOTD from the provided element down into the container

diff --git a/src/mkws-widget-termlists.js b/src/mkws-widget-termlists.js
index e29ede0..33d12b9 100644 (file)
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -1,13 +1,23 @@
 mkws.registerWidgetType('Termlists', function() {
     var that = this;
-    var facets = that.config.facets;
 
+    // Initially hide the termlists; display when we get results
+    $(document).ready(function() {
+        $(that.node).hide();
+    });
     this.team.queue("termlists").subscribe(function(data) {
-       // display if we first got results
        $(that.node).show();
     });
 
-    widget.autosearch(that);
+    var acc = [];
+    var facets = this.config.facets;
+    acc.push('<div class="title">' + mkws.M('Termlists') + '</div>');
+    for (var i = 0; i < facets.length; i++) {
+       acc.push('<div class="mkwsFacet mkwsTeam_', this.team.name(), '" data-mkws-facet="', facets[i], '">', '</div>');
+    }
+    $(this.node).html(acc.join(''));
+
+    widget.autosearch(this);
 });
 
 

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 90f1794..5103bbc 100644 (file)
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -371,3 +371,28 @@ mkws.registerWidgetType('SearchForm', function() {
 });
 
 
+mkws.registerWidgetType('Results', function() {
+    var tname = this.team.name();
+
+    $(this.node).html('\
+<table width="100%" border="0" cellpadding="6" cellspacing="0">\
+  <tr>\
+    <td class="mkwsTermlistContainer1 mkwsTeam_' + tname + '" width="250" valign="top">\
+      <div class="mkwsTermlists mkwsTeam_' + tname + '"></div>\
+    </td>\
+    <td class="mkwsMOTDContainer mkwsTeam_' + tname + '" valign="top">\
+      <div class="mkwsRanking mkwsTeam_' + tname + '"></div>\
+      <div class="mkwsPager mkwsTeam_' + tname + '"></div>\
+      <div class="mkwsNavi mkwsTeam_' + tname + '"></div>\
+      <div class="mkwsRecords mkwsTeam_' + tname + '"></div>\
+    </td>\
+  </tr>\
+  <tr>\
+    <td colspan="2">\
+      <div class="mkwsTermlistContainer2 mkwsTeam_' + tname + '"></div>\
+    </td>\
+  </tr>\
+</table>');
+});
+
+