X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=38b850765fb9eb04327f1f3395cb44c8b70c3b16;hb=a3e4a88ed0be613c6e9e06f50d24058f460bfe76;hp=8258bd1d09e065ac189ca99f0ab23c2cf3b87e90;hpb=5b6dfafa13033d2fa76f3a08cd55498701fc0a83;p=mkws-moved-to-github.git
diff --git a/src/mkws-team.js b/src/mkws-team.js
index 8258bd1..38b8507 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -27,7 +27,8 @@ function team($, teamName) {
};
var m_paz; // will be initialised below
var m_template = {};
- var m_config = Object.create(mkws.config);
+ var m_config = mkws.objectInheritingFrom(mkws.config);
+ var m_widgets = {}; // Maps widget-type to object
that.toString = function() { return '[Team ' + teamName + ']'; };
@@ -48,12 +49,12 @@ function team($, teamName) {
// The following PubSub code is modified from the jQuery manual:
- // https://api.jquery.com/jQuery.Callbacks/
+ // http://api.jquery.com/jQuery.Callbacks/
//
// Use as:
// team.queue("eventName").subscribe(function(param1, param2 ...) { ... });
// team.queue("eventName").publish(arg1, arg2, ...);
-
+ //
var queues = {};
function queue(id) {
if (!queues[id]) {
@@ -115,8 +116,9 @@ function team($, teamName) {
}
function onStat(data) {
- log("stat");
queue("stat").publish(data);
+ if (parseInt(data.activeclients[0], 10) === 0)
+ queue("complete").publish(parseInt(data.hits[0], 10));
}
function onTerm(data) {
@@ -239,6 +241,7 @@ function team($, teamName) {
that.reShow = function() {
+ resetPage();
m_paz.show(0, m_perpage, m_sortOrder);
};
@@ -329,10 +332,10 @@ function team($, teamName) {
// switching view between targets and records
function switchView(view) {
- var targets = findnode('.mkwsTargets');
- var results = findnode('.mkwsResults,.mkwsRecords');
- var blanket = findnode('.mkwsBlanket');
- var motd = findnode('.mkwsMOTD');
+ var targets = widgetNode('Targets');
+ var results = widgetNode('Results') || widgetNode('Records');
+ var blanket = widgetNode('Blanket');
+ var motd = widgetNode('MOTD');
switch(view) {
case 'targets':
@@ -427,24 +430,12 @@ function team($, teamName) {
\
');
- mkws.facetConfig = {
- xtargets: [ "Sources", 16, false ],
- subject: [ "Subjects", 10, true ],
- author: [ "Authors", 10, true ]
- }
-
var acc = [];
var facets = m_config.facets;
acc.push('
' + M('Termlists') + '
');
for (var i = 0; i < facets.length; i++) {
- var name = facets[i]
- var ref = mkws.facetConfig[name];
- if (!ref) {
- alert("bad facet configuration: '" + name + "'");
- } else {
- acc.push('');
- acc.push('
');
- }
+ acc.push('');
+ acc.push('
');
}
findnode(".mkwsTermlists").html(acc.join(''));
@@ -461,13 +452,13 @@ function team($, teamName) {
mkwsHtmlSwitch();
findnode('.mkwsSearchForm').submit(function() {
- var val = findnode('.mkwsQuery').val();
+ var val = widgetNode('Query').val();
newSearch(val);
return false;
});
// on first page, hide the termlist
- $(document).ready(function() { findnode(".mkwsTermlists").hide(); });
+ $(document).ready(function() { widgetNode("Termlists").hide(); });
var container = findnode(".mkwsMOTDContainer");
if (container.length) {
// Move the MOTD from the provided element down into the container
@@ -614,7 +605,12 @@ function team($, teamName) {
teamName = teamName || m_teamName;
selector = $.map(selector.split(','), function(s, i) {
- return s + '.mkwsTeam_' + teamName;
+ if (teamName === 'AUTO') {
+ return (s + '.mkwsTeam_' + teamName + ',' +
+ s + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"])');
+ } else {
+ return s + '.mkwsTeam_' + teamName;
+ }
}).join(',');
var node = $(selector);
@@ -624,6 +620,13 @@ function team($, teamName) {
that.findnode = findnode;
+ // This much simpler and more efficient function should be usable
+ // in place of most uses of findnode.
+ function widgetNode(type) {
+ var w = that.widget(type);
+ return w ? $(w.node) : undefined;
+ }
+
function renderDetails(data, marker) {
var template = loadTemplate("Record");
var details = template(data);
@@ -746,6 +749,28 @@ function team($, teamName) {
return s;
}
+ that.addWidget = function(w) {
+ if (!m_widgets[w.type]) {
+ m_widgets[w.type] = w;
+ log("Registered '" + w.type + "' widget in team '" + m_teamName + "'");
+ } else if (typeof(m_widgets[w.type]) !== 'number') {
+ m_widgets[w.type] = 2;
+ log("Registered duplicate '" + w.type + "' widget in team '" + m_teamName + "'");
+ } else {
+ m_widgets[w.type] += 1;
+ log("Registered '" + w.type + "' widget #" + m_widgets[w.type] + "' in team '" + m_teamName + "'");
+ }
+ }
+
+ that.widgetTypes = function() {
+ var keys = [];
+ for (var k in m_widgets) keys.push(k);
+ return keys.sort();
+ }
+
+ that.widget = function(type) {
+ return m_widgets[type];
+ }
mkwsHtmlAll()