redrawNavi was a one-line function invoked in only one place.

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index b6f0e0e..6d03d07 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -163,7 +163,8 @@ function widget($, team, type, node) {
        Stat: promoteStat,
        Termlists: promoteTermlists,
        Pager: promotePager,
-       Records: promoteRecords
+       Records: promoteRecords,
+       Navi: promoteNavi
     };
 
     var promote = type2fn[type];
@@ -183,8 +184,6 @@ function widget($, team, type, node) {
 
     function promoteTargets() {
        team.queue("targets").subscribe(function(data) {
-           if (node.length === 0) alert("huh?!");
-
            var table ='<table><thead><tr>' +
                '<td>' + M('Target ID') + '</td>' +
                '<td>' + M('Hits') + '</td>' +
@@ -370,6 +369,31 @@ function widget($, team, type, node) {
            }
        });
     }
+
+
+    function promoteNavi() {
+       team.queue("navi").subscribe(function() {
+           var filters = team.filters();
+           var text = "";
+
+           for (var i in filters) {
+               if (text) {
+                   text += " | ";
+               }
+               var filter = filters[i];
+               if (filter.id) {
+                   text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + team.name() +
+                       "', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
+               } else {
+                   text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + team.name() +
+                       "', '" + filter.field + "', '" + filter.value + "'" +
+                       ');return false;">' + filter.value + '</a>';
+               }
+           }
+
+           $(node).html(text);
+       });
+    }
 }
 
 
@@ -407,6 +431,7 @@ function team($, teamName) {
     that.currentPage = function() { return m_currentPage; }
     that.currentRecordId = function() { return m_currentRecordId; }
     that.currentRecordData = function() { return m_currentRecordData; }
+    that.filters = function() { return m_filters; }
 
     var debug = function (s) {
        var now = $.now();
@@ -525,47 +550,29 @@ function team($, teamName) {
        }
 
        m_filters = []
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch(query, sortOrder, targets);
        switchView('records'); // In case it's configured to start off as hidden
        m_submitted = true;
     }
 
 
-    function onSelectDdChange()
+    function onSortChange()
     {
+       m_sortOrder = findnode('.mkwsSort').val();
        if (!m_submitted) return false;
        resetPage();
-       loadSelect();
        m_paz.show(0, m_perpage, m_sortOrder);
        return false;
     }
 
 
-    function redrawNavi ()
+    function onPerpageChange()
     {
-       var navi = findnode('.mkwsNavi');
-       if (!navi) return;
-
-       var text = "";
-       for (var i in m_filters) {
-           if (text) {
-               text += " | ";
-           }
-           var filter = m_filters[i];
-           if (filter.id) {
-               text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + m_teamName +
-                   "', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
-           } else {
-               text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + m_teamName +
-                   "', '" + filter.field + "', '" + filter.value + "'" +
-                   ');return false;">' + filter.value + '</a>';
-           }
-       }
-
-       navi.html(text);
+       m_perpage = findnode('.mkwsPerpage').val();
+       if (!m_submitted) return false;
+       resetPage();
+       m_paz.show(0, m_perpage, m_sortOrder);
+       return false;
     }
 
 
@@ -576,23 +583,11 @@ function team($, teamName) {
     }
 
 
-    function loadSelect ()
-    {
-       var node = findnode('.mkwsSort');
-       if (node.length && node.val() != m_sortOrder) {
-           debug("changing m_sortOrder from " + m_sortOrder + " to " + node.val());
-           m_sortOrder = node.val();
-       }
-       node = findnode('.mkwsPerpage');
-       if (node.length && node.val() != m_perpage) {
-           debug("changing m_perpage from " + m_perpage + " to " + node.val());
-           m_perpage = node.val();
-       }
-    }
-
-
     function triggerSearch (query, sortOrder, targets)
     {
+       resetPage();
+       queue("navi").publish();
+
        var pp2filter = "";
        var pp2limit = "";
 
@@ -643,9 +638,6 @@ function team($, teamName) {
     {
        debug("limitTarget(id=" + id + ", name=" + name + ")");
        m_filters.push({ id: id, name: name });
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -656,9 +648,6 @@ function team($, teamName) {
     {
        debug("limitQuery(field=" + field + ", value=" + value + ")");
        m_filters.push({ field: field, value: value });
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -679,9 +668,6 @@ function team($, teamName) {
        }
        m_filters = newFilters;
 
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -704,9 +690,6 @@ function team($, teamName) {
        }
        m_filters = newFilters;
 
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -846,8 +829,7 @@ function team($, teamName) {
 
        var node = findnode(".mkwsRanking");
        if (node.length) {
-           var ranking_data = '';
-           ranking_data += '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
+           var ranking_data = '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
            if (mkws_config.show_sort) {
                ranking_data +=  M('Sort by') + ' ' + mkwsHtmlSort() + ' ';
            }
@@ -867,10 +849,10 @@ function team($, teamName) {
            node.submit(onFormSubmitEventHandler);
        node = findnode('.mkwsSort');
        if (node.length)
-           node.change(onSelectDdChange);
+           node.change(onSortChange);
        node = findnode('.mkwsPerpage');
        if (node.length)
-           node.change(onSelectDdChange);
+           node.change(onPerpageChange);
 
        // on first page, hide the termlist
        $(document).ready(function() { findnode(".mkwsTermlists").hide(); });
@@ -1508,7 +1490,7 @@ function team($, teamName) {
        // Second pass: make the individual widget objects. This has
        // to be done separately, and after the team-creation, since
        // that sometimes makes new widget nodes (e.g. creating
-       // mkwsTermlists instead mkwsResults.
+       // mkwsTermlists inside mkwsResults.
        $('[class^="mkws"],[class*=" mkws"]').each(function () {
            mkws.handleNodeWithTeam(this, function(tname, type) {
                var myTeam = mkws.teams[tname];