Move mkws.log out of immediate-execute wrapper.

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

diff --git a/src/mkws-team.js b/src/mkws-team.js
index bbb59a9..54a73a6 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -28,6 +28,7 @@ function team($, teamName) {
     var m_paz; // will be initialised below
     var m_template = {};
 
+    that.toString = function() { return '[Team ' + teamName + ']'; }
 
     // Accessor methods for individual widgets: readers
     that.name = function() { return m_teamName; }
@@ -76,34 +77,28 @@ function team($, teamName) {
                    });
 
 
-    //
     // pz2.js event handlers:
-    //
     function onInit() {
        log("init");
        m_paz.stat();
        m_paz.bytarget();
     }
 
-
     function onBytarget(data) {
        log("target");
        queue("targets").publish(data);
     }
 
-
     function onStat(data) {
        log("stat");
        queue("stat").publish(data);
     }
 
-
     function onTerm(data) {
        log("term");
        queue("termlists").publish(data);
     }
 
-
     function onShow(data, teamName) {
        log("show");
        m_totalRecordCount = data.merged;
@@ -111,14 +106,12 @@ function team($, teamName) {
        queue("records").publish(data);
     }
 
-
     function onRecord(data, args, teamName) {
        log("record");
        // FIXME: record is async!!
        clearTimeout(m_paz.recordTimer);
-       // ##### restrict to current team
-       var detRecordDiv = document.getElementById(recordDetailsId(data.recid[0]));
-       if (detRecordDiv) {
+       var detRecordDiv = findnode(recordDetailsId(data.recid[0]));
+       if (detRecordDiv.length) {
            // in case on_show was faster to redraw element
            return;
        }
@@ -129,7 +122,7 @@ function team($, teamName) {
     }
 
 
-    // Used by promoteRecords() and onRecord()
+    // Used by the Records widget and onRecord()
     function recordElementId(s) {
        return 'mkwsRec_' + s.replace(/[^a-z0-9]/ig, '_');
     }
@@ -139,7 +132,6 @@ function team($, teamName) {
     function recordDetailsId(s) {
        return 'mkwsDet_' + s.replace(/[^a-z0-9]/ig, '_');
     }
-    that.recordElementId = recordElementId;
 
 
     that.targetFiltered = function(id) {
@@ -153,12 +145,7 @@ function team($, teamName) {
     }
 
 
-    ////////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////////////////
-
-
-    // limit by target functions
-    that.limitTarget  = function (id, name)
+    that.limitTarget = function(id, name)
     {
        log("limitTarget(id=" + id + ", name=" + name + ")");
        m_filters.push({ id: id, name: name });
@@ -167,8 +154,7 @@ function team($, teamName) {
     }
 
 
-    // limit the query after clicking the facet
-    that.limitQuery = function (field, value)
+    that.limitQuery = function(field, value)
     {
        log("limitQuery(field=" + field + ", value=" + value + ")");
        m_filters.push({ field: field, value: value });
@@ -177,7 +163,7 @@ function team($, teamName) {
     }
 
 
-    that.delimitTarget = function (id)
+    that.delimitTarget = function(id)
     {
        log("delimitTarget(id=" + id + ")");
        var newFilters = [];
@@ -197,7 +183,7 @@ function team($, teamName) {
     }
 
 
-    that.delimitQuery = function (field, value)
+    that.delimitQuery = function(field, value)
     {
        log("delimitQuery(field=" + field + ", value=" + value + ")");
        var newFilters = [];
@@ -219,14 +205,14 @@ function team($, teamName) {
     }
 
 
-    that.showPage = function (pageNum)
+    that.showPage = function(pageNum)
     {
        m_currentPage = pageNum;
        m_paz.showPage(m_currentPage - 1);
     }
 
 
-    that.pagerNext = function () {
+    that.pagerNext = function() {
        if (m_totalRecordCount - m_perpage*m_currentPage > 0) {
             m_paz.showNext();
             m_currentPage++;
@@ -234,7 +220,7 @@ function team($, teamName) {
     }
 
 
-    that.pagerPrev = function () {
+    that.pagerPrev = function() {
        if (m_paz.showPrev() != false)
             m_currentPage--;
     }
@@ -269,7 +255,7 @@ function team($, teamName) {
     }
 
 
-    function triggerSearch (query, sortOrder, targets)
+    function triggerSearch(query, sortOrder, targets)
     {
        resetPage();
        queue("navi").publish();
@@ -354,7 +340,7 @@ function team($, teamName) {
 
 
     // detailed record drawing
-    that.showDetails = function (recId) {
+    that.showDetails = function(recId) {
        var oldRecordId = m_currentRecordId;
        m_currentRecordId = recId;
 
@@ -638,7 +624,9 @@ function team($, teamName) {
            return s + '.mkwsTeam_' + teamName;
        }).join(',');
 
-       return $(selector);
+       var node = $(selector);
+       //log('findnode(' + selector + ') found ' + node.length + ' nodes');
+       return node;
     }
 
 
@@ -779,20 +767,7 @@ function team($, teamName) {
     }
     that.queue = queue;
 
+    mkwsHtmlAll()
 
-    // main
-    (function() {
-       try {
-           mkwsHtmlAll()
-       }
-
-       catch (e) {
-           mkws_config.error = e.message;
-           // alert(e.message);
-       }
-    })();
-
-    // Bizarrely, 'that' is just an empty hash. All its state is in
-    // the closure variables defined earlier in this function.
     return that;
 };