X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=872f957ec6df80ff4739c5753cb7a5c1968c7204;hb=acc4c917f360440927547e958ebd32b1d2aca711;hp=b84b174aed189c36a4db231d60ddbb68aee74265;hpb=cdcf0716d785cd1eaff9b859b6425524c5adb4b5;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index b84b174..872f957 100644
--- 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,36 +145,6 @@ function team($, teamName) {
     }
 
 
-    ////////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////////////////
-
-
-    // when search button pressed
-    function onFormSubmitEventHandler()
-    {
-	var val = findnode('.mkwsQuery').val();
-	newSearch(val);
-	return false;
-    }
-
-
-    function newSearch(query, sortOrder, targets)
-    {
-	log("newSearch: " + query);
-
-	if (mkws_config.use_service_proxy && !mkws.authenticated) {
-	    alert("searching before authentication");
-	    return;
-	}
-
-	m_filters = []
-	triggerSearch(query, sortOrder, targets);
-	switchView('records'); // In case it's configured to start off as hidden
-	m_submitted = true;
-    }
-
-
-    // limit by target functions
     that.limitTarget  = function (id, name)
     {
 	log("limitTarget(id=" + id + ", name=" + name + ")");
@@ -192,7 +154,6 @@ function team($, teamName) {
     }
 
 
-    // limit the query after clicking the facet
     that.limitQuery = function (field, value)
     {
 	log("limitQuery(field=" + field + ", value=" + value + ")");
@@ -244,6 +205,32 @@ function team($, teamName) {
     }
 
 
+    that.showPage = function (pageNum)
+    {
+	m_currentPage = pageNum;
+	m_paz.showPage(m_currentPage - 1);
+    }
+
+
+    that.pagerNext = function () {
+	if (m_totalRecordCount - m_perpage*m_currentPage > 0) {
+            m_paz.showNext();
+            m_currentPage++;
+	}
+    }
+
+
+    that.pagerPrev = function () {
+	if (m_paz.showPrev() != false)
+            m_currentPage--;
+    }
+
+
+    that.reShow = function() {
+	m_paz.show(0, m_perpage, m_sortOrder);
+    }
+
+
     function resetPage()
     {
 	m_currentPage = 1;
@@ -252,6 +239,22 @@ function team($, teamName) {
     that.resetPage = resetPage;
 
 
+    function newSearch(query, sortOrder, targets)
+    {
+	log("newSearch: " + query);
+
+	if (mkws_config.use_service_proxy && !mkws.authenticated) {
+	    alert("searching before authentication");
+	    return;
+	}
+
+	m_filters = []
+	triggerSearch(query, sortOrder, targets);
+	switchView('records'); // In case it's configured to start off as hidden
+	m_submitted = true;
+    }
+
+
     function triggerSearch (query, sortOrder, targets)
     {
 	resetPage();
@@ -302,34 +305,6 @@ function team($, teamName) {
     }
 
 
-    that.reShow = function() {
-	m_paz.show(0, m_perpage, m_sortOrder);
-    }
-
-
-
-    that.showPage = function (pageNum)
-    {
-	m_currentPage = pageNum;
-	m_paz.showPage(m_currentPage - 1);
-    }
-
-
-    // simple paging functions
-    that.pagerNext = function () {
-	if (m_totalRecordCount - m_perpage*m_currentPage > 0) {
-            m_paz.showNext();
-            m_currentPage++;
-	}
-    }
-
-
-    that.pagerPrev = function () {
-	if (m_paz.showPrev() != false)
-            m_currentPage--;
-    }
-
-
     // switching view between targets and records
     function switchView(view) {
 	var targets = findnode('.mkwsTargets');
@@ -446,7 +421,11 @@ function team($, teamName) {
 
 	mkwsHtmlSwitch();
 
-	findnode('.mkwsSearchForm').submit(onFormSubmitEventHandler);
+	findnode('.mkwsSearchForm').submit(function() {
+	    var val = findnode('.mkwsQuery').val();
+	    newSearch(val);
+	    return false;
+	});
 
 	// on first page, hide the termlist
 	$(document).ready(function() { findnode(".mkwsTermlists").hide(); });
@@ -645,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;
     }
 
 
@@ -786,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;
 };