X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=0766f51867d31becf31881ddd33f01191a93f774;hb=9d30056b825036d1ff7c6ad324a9218e642b2010;hp=c506ccfe645b658ac0307e082bf781cef59cc3ef;hpb=db352294db725a7576d7f867b15a5cded97e248e;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index c506ccf..0766f51 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -158,24 +158,21 @@ function widget($, team, type, node) {
 
     var M = mkws.M;
 
-    if (type === 'Targets') {
-	promoteTargets();
-	team.debug("made targets widget(node=" + node + ")");
-    } else if (type === 'Stat') {
-	promoteStat();
-	team.debug("made stat widget(node=" + node + ")");
-    } else if (type === 'Termlists') {
-	promoteTermlists();
-	team.debug("made termlists widget(node=" + node + ")");
-    } else if (type === 'Pager') {
-	promotePager();
-	team.debug("made pager widget(node=" + node + ")");
-    } else if (type === 'Records') {
-	promoteRecords();
-	team.debug("made records widget(node=" + node + ")");
+    var type2fn = {
+	Targets: promoteTargets,
+	Stat: promoteStat,
+	Termlists: promoteTermlists,
+	Pager: promotePager,
+	Records: promoteRecords,
+	Navi: promoteNavi
+    };
+
+    var promote = type2fn[type];
+    if (promote) {
+	promote();
+	team.debug("made " + type + " widget(node=" + node + ")");
     } else {
-	// ### Handle other types here
-	team.debug("made unencapsulated widget(type=" + type + ", node=" + node + ")");
+	team.debug("made UNENCAPSULATED widget(type=" + type + ", node=" + node + ")");
     }
 
     return that;
@@ -187,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>' +
@@ -360,7 +355,7 @@ function widget($, team, type, node) {
 		// from the team object into this widget.
 		if (hit.recid == team.currentRecordId()) {
 		    if (team.currentRecordData())
-			html.push(renderDetails(team.currentRecordData()));
+			html.push(team.renderDetails(team.currentRecordData()));
 		}
 	    }
 	    $(node).html(html.join(''));
@@ -374,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);
+	});
+    }
 }
 
 
@@ -411,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();
@@ -529,47 +550,35 @@ 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;
+	m_perpage = findnode('.mkwsPerpage').val();
+	if (!m_submitted) return false;
+	resetPage();
+	m_paz.show(0, m_perpage, m_sortOrder);
+	return false;
+    }
 
-	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);
+    function redrawNavi ()
+    {
+	queue("navi").publish();
     }
 
 
@@ -580,23 +589,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)
     {
+	redrawNavi();
+	resetPage();
+
 	var pp2filter = "";
 	var pp2limit = "";
 
@@ -647,9 +644,6 @@ function team($, teamName) {
     {
 	debug("limitTarget(id=" + id + ", name=" + name + ")");
 	m_filters.push({ id: id, name: name });
-	redrawNavi();
-	resetPage();
-	loadSelect();
 	triggerSearch();
 	return false;
     }
@@ -660,9 +654,6 @@ function team($, teamName) {
     {
 	debug("limitQuery(field=" + field + ", value=" + value + ")");
 	m_filters.push({ field: field, value: value });
-	redrawNavi();
-	resetPage();
-	loadSelect();
 	triggerSearch();
 	return false;
     }
@@ -683,9 +674,6 @@ function team($, teamName) {
 	}
 	m_filters = newFilters;
 
-	redrawNavi();
-	resetPage();
-	loadSelect();
 	triggerSearch();
 	return false;
     }
@@ -708,9 +696,6 @@ function team($, teamName) {
 	}
 	m_filters = newFilters;
 
-	redrawNavi();
-	resetPage();
-	loadSelect();
 	triggerSearch();
 	return false;
     }
@@ -850,8 +835,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() + ' ';
 	    }
@@ -871,10 +855,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(); });
@@ -1074,6 +1058,7 @@ function team($, teamName) {
 	var details = template(data);
 	return '<div class="details" id="mkwsDet_' + m_teamName + '_' + data.recid + '">' + details + '</div>';
     }
+    that.renderDetails = renderDetails;
 
 
     function loadTemplate(name)
@@ -1511,7 +1496,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];