Break some long lines.

[mkws-moved-to-github.git] / src / mkws-team.js

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 100ce3e..c26ab04 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -47,9 +47,9 @@ function team($, teamName) {
 
     function log(s) {
        var now = $.now();
-       var timestamp = ((now - m_logTime.start)/1000).toFixed(3) + " (+" + ((now - m_logTime.last)/1000).toFixed(3) + ") "
+       var timestamp = (((now - m_logTime.start)/1000).toFixed(3) + " (+" +
+                        ((now - m_logTime.last)/1000).toFixed(3) + ") ");
        m_logTime.last = now;
-
        mkws.log(m_teamName + ": " + timestamp + s);
     }
     that.log = log;
@@ -166,18 +166,7 @@ function team($, teamName) {
     that.delimitTarget = function(id)
     {
        log("delimitTarget(id=" + id + ")");
-       var newFilters = [];
-       for (var i in m_filters) {
-           var filter = m_filters[i];
-           if (filter.id) {
-               log("delimitTarget() removing filter " + $.toJSON(filter));
-           } else {
-               log("delimitTarget() keeping filter " + $.toJSON(filter));
-               newFilters.push(filter);
-           }
-       }
-       m_filters = newFilters;
-
+       removeMatchingFilters(function(f) { return f.id });
        triggerSearch();
        return false;
     };
@@ -186,23 +175,25 @@ function team($, teamName) {
     that.delimitQuery = function(field, value)
     {
        log("delimitQuery(field=" + field + ", value=" + value + ")");
+       removeMatchingFilters(function(f) { return f.field && field == f.field && value == f.value });
+       triggerSearch();
+       return false;
+    };
+
+
+    function removeMatchingFilters(matchFn) {
        var newFilters = [];
        for (var i in m_filters) {
            var filter = m_filters[i];
-           if (filter.field &&
-               field == filter.field &&
-               value == filter.value) {
-               log("delimitQuery() removing filter " + $.toJSON(filter));
+           if (matchFn(filter)) {
+               log("removeMatchingFilters() removing filter " + $.toJSON(filter));
            } else {
-               log("delimitQuery() keeping filter " + $.toJSON(filter));
+               log("removeMatchingFilters() keeping filter " + $.toJSON(filter));
                newFilters.push(filter);
            }
        }
        m_filters = newFilters;
-
-       triggerSearch();
-       return false;
-    };
+    }
 
 
     that.showPage = function(pageNum)
@@ -297,7 +288,8 @@ function team($, teamName) {
            params.limit = pp2limit;
        }
 
-       log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
+       log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", " +
+           "pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
 
        // We can use: params.torusquery = "udb=NAME"
        // Note: that won't work when running against raw pazpar2
@@ -634,7 +626,8 @@ function team($, teamName) {
     {
        var template = loadTemplate("Record");
        var details = template(data);
-       return '<div class="details mkwsTeam_' + m_teamName + '" id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
+       return '<div class="details mkwsTeam_' + m_teamName + '" ' +
+           'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
     }
     that.renderDetails = renderDetails;