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

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 5804c1f..50eec65 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -236,7 +236,7 @@ function team($, teamName) {
     var m_curPage = 1;
     var m_curDetRecId = '';
     var m_curDetRecData = null;
-    var m_debug_time = {
+    var m_debugTime = {
        // Timestamps for logging
        "start": $.now(),
        "last": $.now()
@@ -247,8 +247,8 @@ function team($, teamName) {
 
     var debug = function (s) {
        var now = $.now();
-       var timestamp = ((now - m_debug_time.start)/1000).toFixed(3) + " (+" + ((now - m_debug_time.last)/1000).toFixed(3) + ") "
-       m_debug_time.last = now;
+       var timestamp = ((now - m_debugTime.start)/1000).toFixed(3) + " (+" + ((now - m_debugTime.last)/1000).toFixed(3) + ") "
+       m_debugTime.last = now;
 
        mkws.debug(m_teamName + ": " + timestamp + s);
     }
@@ -478,7 +478,7 @@ function team($, teamName) {
     }
 
 
-    function newSearch(query, sort, targets)
+    function newSearch(query, sortOrder, targets)
     {
        debug("newSearch: " + query);
 
@@ -491,7 +491,7 @@ function team($, teamName) {
        redrawNavi();
        resetPage();
        loadSelect();
-       triggerSearch(query, sort, targets);
+       triggerSearch(query, sortOrder, targets);
        switchView('records'); // In case it's configured to start off as hidden
        m_submitted = true;
     }
@@ -554,17 +554,17 @@ function team($, teamName) {
     }
 
 
-    function triggerSearch (query, sort, targets)
+    function triggerSearch (query, sortOrder, targets)
     {
        var pp2filter = "";
        var pp2limit = "";
 
-       // Re-use previous query/sort if new ones are not specified
+       // Re-use previous query/sort-order if new ones are not specified
        if (query) {
            m_query = query;
        }
-       if (sort) {
-           m_sortOrder = sort;
+       if (sortOrder) {
+           m_sortOrder = sortOrder;
        }
        if (targets) {
            m_filters.push({ id: targets, name: targets });
@@ -985,14 +985,14 @@ function team($, teamName) {
 
        debug("node=" + node + ", class='" + node.className + "', query=" + query);
 
-       var sort = node.attr('sort');
+       var sortOrder = node.attr('sort');
        var targets = node.attr('targets');
        var s = "running auto search: '" + query + "'";
-       if (sort) s += " sorted by '" + sort + "'";
+       if (sortOrder) s += " sorted by '" + sortOrder + "'";
        if (targets) s += " in targets '" + targets + "'";
        debug(s);
 
-       newSearch(query, sort, targets);
+       newSearch(query, sortOrder, targets);
     }