X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=0ee99f3c8973cc11bd246a53e3179fe1cf5073e4;hb=c2e8b29c9d62f76f678b947c774acb589691734e;hp=573eb04e0af1654ffe65edd3e4274081863bacf0;hpb=c2074eeee90862c15cddd8d5a833567c97d625e4;p=mkws-moved-to-github.git
diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index 573eb04..0ee99f3 100644
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -1,417 +1,379 @@
+(function($) { // jQuery wrapper
+
// Functions follow for promoting the regular widget object into
// widgets of specific types. These could be moved into their own
// source files.
-mkws.registerWidgetType('Targets', function() {
- var that = this;
- var M = mkws.M;
-
- $(this.node).html('\
-
\
-No information available yet.\
-
');
- $(this.node).css("display", "none");
-
- this.team.queue("targets").subscribe(function(data) {
- var table ='' +
- '' + M('Target ID') + ' ' +
- '' + M('Hits') + ' ' +
- '' + M('Diags') + ' ' +
- '' + M('Records') + ' ' +
- '' + M('State') + ' ' +
- ' ';
-
- for (var i = 0; i < data.length; i++) {
- table += "" + data[i].id +
- " " + data[i].hits +
- " " + data[i].diagnostic +
- " " + data[i].records +
- " " + data[i].state + " ";
- }
-
- table += '
';
- var subnode = $(that.node).children('.mkwsBytarget');
- subnode.html(table);
- });
-});
-
-
-mkws.registerWidgetType('Stat', function() {
- var that = this;
- var M = mkws.M;
-
- this.team.queue("stat").subscribe(function(data) {
- if (that.node.length === 0) alert("huh?!");
+mkws.registerWidgetType('targets', function() {
+ if (!this.config.show_switch) return;
+ var that = this;
+
+ this.node.html('No information available yet.');
+ this.node.css("display", "none");
+
+ this.team.queue("targets").subscribe(function(data) {
+ // There is a bug in pz2.js wherein it makes each data object an array but
+ // simply assigns properties to it.
+ // TODO: remove this when PAZ-946 is addressed.
+ var cleandata = [];
+ for (var i = 0; i < data.length; i++) {
+ var cur = {};
+ cur.id = data[i].id;
+ cur.hits = data[i].hits;
+ cur.diagnostic = data[i].diagnostic;
+ cur.records = data[i].records;
+ cur.state = data[i].state;
+ cleandata.push(cur);
+ }
- $(that.node).html('' + M('Status info') + ' ' +
- ' -- ' +
- '' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + ' ' +
- ' -- ' +
- '' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + ' ');
- });
+ var template = that.team.loadTemplate(that.config.template || "targets");
+ that.node.html(template({data: cleandata}));
+ });
});
-mkws.registerWidgetType('Pager', function() {
- var that = this;
- var M = mkws.M;
-
- this.team.queue("pager").subscribe(function(data) {
- $(that.node).html(drawPager(data))
-
- function drawPager(data) {
- var teamName = that.team.name();
- var s = '' + M('Displaying') + ': '
- + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
- ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
- + data.total + ')
';
-
- //client indexes pages from 1 but pz2 from 0
- var onsides = 6;
- var pages = Math.ceil(that.team.totalRecordCount() / that.team.perpage());
- var currentPage = that.team.currentPage();
-
- var firstClkbl = (currentPage - onsides > 0)
- ? currentPage - onsides
- : 1;
-
- var lastClkbl = firstClkbl + 2*onsides < pages
- ? firstClkbl + 2*onsides
- : pages;
-
- var prev = '<< ' + M('Prev') + ' | ';
- if (currentPage > 1)
- prev = ''
- +'<< ' + M('Prev') + ' | ';
-
- var middle = '';
- for(var i = firstClkbl; i <= lastClkbl; i++) {
- var numLabel = i;
- if(i == currentPage)
- numLabel = '' + i + ' ';
-
- middle += ' '
- + numLabel + ' ';
- }
-
- var next = ' | ' + M('Next') + ' >> ';
- if (pages - currentPage > 0)
- next = ' | '
- + M('Next') + ' >> ';
+mkws.registerWidgetType('stat', function() {
+ var that = this;
+ this.team.queue("stat").subscribe(function(data) {
+ var template = that.team.loadTemplate(that.config.template || "stat");
+ that.node.html(template(data));
+ });
+});
- var predots = '';
- if (firstClkbl > 1)
- predots = '...';
- var postdots = '';
- if (lastClkbl < pages)
- postdots = '...';
+mkws.registerWidgetType('pager', function() {
+ var that = this;
+ var M = mkws.M;
+
+ this.team.queue("pager").subscribe(function(data) {
+ var teamName = that.team.name();
+ var output = {};
+ output.first = data.start + 1;
+ output.last = data.start + data.num;
+ output.count = data.merged;
+ output.found = data.total;
+
+ //client indexes pages from 1 but pz2 from 0
+ var onsides = 6;
+ var pages = Math.ceil(that.team.totalRecordCount() / that.team.perpage());
+ var currentPage = that.team.currentPage();
+
+ var firstClkbl = (currentPage - onsides > 0)
+ ? currentPage - onsides
+ : 1;
+ var lastClkbl = firstClkbl + 2*onsides < pages
+ ? firstClkbl + 2*onsides
+ : pages;
+
+ if (firstClkbl > 1) output.morePrev = true;
+ if (lastClkbl < pages) output.moreNext = true;
+
+ if (currentPage > 1) output.prevClick = "mkws.pagerPrev(\'" + teamName + "\');";
+
+ output.pages = [];
+ for(var i = firstClkbl; i <= lastClkbl; i++) {
+ var o = {};
+ o.number = i;
+ if (i !== currentPage) {
+ o.click = "mkws.showPage(\'" + teamName + "\', " + i + ");";
+ }
+ output.pages.push(o);
+ }
- s += ''
- + prev + predots + middle + postdots + next + '
';
+ if (pages - currentPage > 0) output.nextClick = "mkws.pagerNext(\'" + teamName + "\')";
- return s;
- }
- });
+ var template = that.team.loadTemplate(that.config.template || "pager");
+ that.node.html(template(output));
+ });
});
-
-mkws.registerWidgetType('Results', function() {
- // Nothing to do apart from act as an autosearch trigger
- // Contained elements do all the real work
- widget.autosearch(this);
+mkws.registerWidgetType('details', function() {
+ var that = this;
+ var recid = that.node.attr("data-mkws-recid");
+ if (this.team.gotRecords()) {
+ that.team.fetchDetails(recid);
+ } else {
+ this.team.queue("firstrecords").subscribe(function() {
+ that.team.fetchDetails(recid);
+ });
+ }
+ this.team.queue("record").subscribe(function(data) {
+ console.log(data);
+ if ($.inArray(recid, data.recid) > -1) {
+ var template = that.team.loadTemplate(that.config.template || "details");
+ that.node.html(template(data));
+ }
+ });
+ that.autosearch();
});
+mkws.registerWidgetType('records', function() {
+ var that = this;
+ var team = this.team;
+
+ this.team.queue("records").subscribe(function(data) {
+ for (var i = 0; i < data.hits.length; i++) {
+ var hit = data.hits[i];
+ that.team.queue("record").publish(hit);
+ hit.detailLinkId = team.recordElementId(hit.recid[0]);
+ hit.detailClick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;";
+ hit.containerClass = "mkws-summary mkwsSummary mkws-team-" + team.name();
+ hit.containerClass += " " + hit.detailLinkId;
+ // ### At some point, we may be able to move the
+ // m_currentRecordId and m_currentRecordData members
+ // from the team object into this widget.
+ if (hit.recid == team.currentRecordId()) {
+ if (team.currentRecordData()) {
+ hit.renderedDetails = team.renderDetails(team.currentRecordData());
+ }
+ }
+ }
+ var template = team.loadTemplate(that.config.template || "records");
+ var targs = $.extend({}, {"hits": data.hits}, that.config.template_vars);
+ that.node.html(template(targs));
+ });
-mkws.registerWidgetType('Records', function() {
- var that = this;
- var team = this.team;
-
- this.team.queue("records").subscribe(function(data) {
- var html = [];
- for (var i = 0; i < data.hits.length; i++) {
- var hit = data.hits[i];
- that.team.queue("record").publish(hit);
- var divId = team.recordElementId(hit.recid[0]);
- html.push('', renderSummary(hit), '
');
- // ### At some point, we may be able to move the
- // m_currentRecordId and m_currentRecordData members
- // from the team object into this widget.
- if (hit.recid == team.currentRecordId()) {
- if (team.currentRecordData())
- html.push(team.renderDetails(team.currentRecordData()));
- }
- }
- $(that.node).html(html.join(''));
-
- function renderSummary(hit) {
- var template = team.loadTemplate(that.config.template || "Summary");
- hit._id = team.recordElementId(hit.recid[0]);
- hit._onclick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;"
- return template(hit);
- }
- });
-
- widget.autosearch(that);
+ that.autosearch();
});
-mkws.registerWidgetType('Navi', function() {
- var that = this;
- var teamName = this.team.name();
- var M = mkws.M;
-
- this.team.queue("navi").subscribe(function() {
- var filters = that.team.filters();
- var text = "";
+mkws.registerWidgetType('navi', function() {
+ var that = this;
+ var teamName = this.team.name();
- filters.visitTargets(function(id, name) {
- if (text) text += " | ";
- text += M('source') + ': ' + name + ' ';
- });
+ this.team.queue("navi").subscribe(function() {
+ var filters = that.team.filters();
+ var output = {filters:[]};
- filters.visitFields(function(field, value) {
- if (text) text += " | ";
- text += M(field) + ': ' + value + ' ';
- });
+ filters.visitTargets(function(id, name) {
+ var cur = {};
+ cur.facet = 'source';
+ cur.value = name;
+ cur.click = "mkws.delimitTarget('" + teamName + "', '" + id + "'); return false;";
+ output.filters.push(cur);
+ });
- $(that.node).html(text);
+ filters.visitFields(function(field, value) {
+ var cur = {};
+ cur.facet = field;
+ cur.value = value;
+ cur.click = "mkws.delimitQuery('" + teamName + "', '" + field + "', '" + value + "'" + ");return false;";
+ output.filters.push(cur);
});
+
+ var template = that.team.loadTemplate(that.config.template || "navi");
+ that.node.html(template(output));
+ });
});
// It seems this and the Perpage widget doen't need to subscribe to
// anything, since they produce events rather than consuming them.
//
-mkws.registerWidgetType('Sort', function() {
- var that = this;
-
- $(this.node).change(function() {
- that.team.set_sortOrder($(that.node).val());
- if (that.team.submitted()) {
- that.team.reShow();
- }
- return false;
- });
-});
-
-
-mkws.registerWidgetType('Perpage', function() {
- var that = this;
+mkws.registerWidgetType('sort', function() {
+ var that = this;
- $(this.node).change(function() {
- that.team.set_perpage($(that.node).val());
- if (that.team.submitted()) {
- that.team.reShow();
- }
- return false;
- });
+ this.node.change(function() {
+ that.team.set_sortOrder(that.node.val());
+ if (that.team.submitted()) {
+ that.team.reShow();
+ }
+ return false;
+ });
});
-mkws.registerWidgetType('Done', function() {
- var that = this;
+mkws.registerWidgetType('per-page', function() {
+ var that = this;
- this.team.queue("complete").subscribe(function(n) {
- $(that.node).html("Search complete: found " + n + " records");
- });
+ this.node.change(function() {
+ that.team.set_perpage(that.node.val());
+ if (that.team.submitted()) {
+ that.team.reShow();
+ }
+ return false;
+ });
});
-mkws.registerWidgetType('Switch', function() {
- var tname = this.team.name();
- $(this.node).html('\
-Records \
-| \
- Targets ');
- widget.hideWhenNarrow(this);
+mkws.registerWidgetType('done', function() {
+ var that = this;
+ this.team.queue("complete").subscribe(function(n) {
+ var template = that.team.loadTemplate(that.config.template || "done");
+ that.node.html(template({count: n}));
+ });
});
-mkws.registerWidgetType('Search', function() {
- var tname = this.team.name();
- var M = mkws.M;
-
- $(this.node).html('\
-');
+mkws.registerWidgetType('switch', function() {
+ if (!this.config.show_switch) return;
+ var tname = this.team.name();
+ var output = {};
+ output.recordClick = "mkws.switchView(\'" + tname + "\', \'records\')";
+ output.targetClick = "mkws.switchView(\'" + tname + "\', \'targets\')";
+ var template = this.team.loadTemplate(this.config.template || "switch");
+ this.node.html(template(output));
+ this.hideWhenNarrow();
});
-mkws.registerWidgetType('SearchForm', function() {
- var team = this.team;
- $(this.node).submit(function() {
- var val = team.widget('Query').value();
- team.newSearch(val);
- return false;
- });
+mkws.registerWidgetType('search', function() {
+ var output = {};
+ output.team = this.team.name();
+ output.queryWidth = this.config.query_width;
+ var template = this.team.loadTemplate(this.config.template || "search");
+ this.node.html(template(output));
});
-mkws.registerWidgetType('Results', function() {
- var tname = this.team.name();
-
- $(this.node).html('\
-\
- \
- \
-
\
- \
- \
-
\
- \
-
\
-
\
- \
- \
- \
- \
-
\
- \
- \
-
');
+mkws.registerWidgetType('search-form', function() {
+ var team = this.team;
+ this.node.submit(function() {
+ var val = team.widget('query').value();
+ team.newSearch(val);
+ return false;
+ });
});
-mkws.registerWidgetType('Ranking', function() {
- var tname = this.team.name();
- var that = this;
- var M = mkws.M;
-
- var s = '';
-
- $(this.node).html(s);
-
-
- function mkwsHtmlSort() {
- var order = that.team.sortOrder();
-
- that.log("HTML sort, sortOrder = '" + order + "'");
- var sort_html = '';
-
- for(var i = 0; i < that.config.sort_options.length; i++) {
- var opt = that.config.sort_options[i];
- var key = opt[0];
- var val = opt.length == 1 ? opt[0] : opt[1];
-
- sort_html += '' + M(val) + ' ';
- }
- sort_html += ' ';
-
- return sort_html;
- }
-
- function mkwsHtmlPerpage() {
- var perpage = that.team.perpage();
-
- that.log("HTML perpage, perpage = " + perpage);
- var perpage_html = '';
-
- for(var i = 0; i < that.config.perpage_options.length; i++) {
- var key = that.config.perpage_options[i];
-
- perpage_html += '' + key + ' ';
- }
- perpage_html += ' ';
-
- return perpage_html;
- }
+mkws.registerWidgetType('results', function() {
+ var template = this.team.loadTemplate(this.config.template || "results");
+ this.node.html(template({team: this.team.name()}));
+ this.autosearch();
});
-mkws.registerWidgetType('Lang', function() {
- // dynamic URL or static page? /path/foo?query=test
- /* create locale language menu */
- if (!this.config.show_lang) return;
+mkws.registerWidgetType('ranking', function() {
+ var output = {};
+ output.perPage = [];
+ output.sort = [];
+ output.team = this.team.name();
+ output.showSort = this.config.show_sort;
+ output.showPerPage = this.config.show_perpage;
+
+ var order = this.team.sortOrder();
+ this.log("making sort, sortOrder = '" + order + "'");
+ for (var i = 0; i < this.config.sort_options.length; i++) {
+ var cur = {};
+ var opt = this.config.sort_options[i];
+ cur.key = opt[0];
+ cur.label = opt.length == 1 ? opt[0] : opt[1];
+ if (order == cur.key || order == cur.label) cur.selected = true;
+ output.sort.push(cur);
+ }
+
+ var perpage = this.team.perpage();
+ this.log("making perpage, perpage = " + perpage);
+ for(var i = 0; i < this.config.perpage_options.length; i++) {
+ var cur = {};
+ cur.perPage = this.config.perpage_options[i];
+ if (cur.perPage == perpage) cur.selected = true;
+ output.perPage.push(cur);
+ }
+
+ var template = this.team.loadTemplate(this.config.template || "ranking");
+ this.node.html(template(output));
+});
- var lang_default = "en";
- var lang = this.config.lang || lang_default;
- var list = [];
- /* display a list of configured languages, or all */
- var lang_options = this.config.lang_options || [];
- var toBeIncluded = {};
- for (var i = 0; i < lang_options.length; i++) {
- toBeIncluded[lang_options[i]] = true;
+mkws.registerWidgetType('lang', function() {
+ // dynamic URL or static page? /path/foo?query=test
+ /* create locale language menu */
+ if (!this.config.show_lang) return;
+
+ var lang_default = "en";
+ var lang = this.config.lang || lang_default;
+ var list = [];
+
+ /* display a list of configured languages, or all */
+ var lang_options = this.config.lang_options || [];
+ var toBeIncluded = {};
+ for (var i = 0; i < lang_options.length; i++) {
+ toBeIncluded[lang_options[i]] = true;
+ }
+
+ for (var k in mkws.locale_lang) {
+ if (toBeIncluded[k] || lang_options.length == 0) {
+ cur = {};
+ if (lang === k) cur.selected = true;
+ cur.code = k;
+ cur.url = lang_url(k);
+ list.push(cur);
}
-
- for (var k in mkws.locale_lang) {
- if (toBeIncluded[k] || lang_options.length == 0)
- list.push(k);
+ }
+
+ // add english link
+ if (lang_options.length == 0 || toBeIncluded[lang_default]) {
+ cur = {};
+ if (lang === lang_default) cur.selected = true;
+ cur.code = lang_default;
+ cur.url = lang_url(lang_default);
+ list.push(cur);
+ }
+
+ this.log("language menu: " + list.join(", "));
+
+ var template = this.team.loadTemplate(this.config.template || "lang");
+ this.node.html(template({languages: list}));
+ this.hideWhenNarrow();
+
+ // set or re-set "lang" URL parameter
+ function lang_url(lang) {
+ var query = location.search;
+ // no query parameters? done
+ if (!query) {
+ return "?lang=" + lang;
}
- // add english link
- if (lang_options.length == 0 || toBeIncluded[lang_default])
- list.push(lang_default);
-
- this.log("Language menu for: " + list.join(", "));
-
- /* the HTML part */
- var data = "";
- for (var i = 0; i < list.length; i++) {
- var l = list[i];
- if (data)
- data += ' | ';
-
- if (lang == l) {
- data += ' ' + l + ' ';
- } else {
- data += ' ' + l + ' '
- }
+ // parameter does not exist
+ if (!query.match(/[\?&]lang=/)) {
+ return query + "&lang=" + lang;
}
- $(this.node).html(data);
- widget.hideWhenNarrow(this);
+ // replace existing parameter
+ query = query.replace(/\?lang=([^]*)/, "?lang=" + lang);
+ query = query.replace(/\&lang=([^]*)/, "&lang=" + lang);
+ return query;
+ }
+});
- // set or re-set "lang" URL parameter
- function lang_url(lang) {
- var query = location.search;
- // no query parameters? done
- if (!query) {
- return "?lang=" + lang;
- }
+mkws.registerWidgetType('motd', function() {
+ var container = this.team.widget('motd-container');
+ if (container) {
+ // Move the MOTD from the provided element down into the container
+ this.node.appendTo(container.node);
+ }
+});
- // parameter does not exist
- if (!query.match(/[\?&]lang=/)) {
- return query + "&lang=" + lang;
- }
- // replace existing parameter
- query = query.replace(/\?lang=([^]*)/, "?lang=" + lang);
- query = query.replace(/\&lang=([^]*)/, "&lang=" + lang);
- return query;
+// This widget has no functionality of its own, but its configuration
+// is copied up into its team, allowing it to affect other widgets in
+// the team.
+//
+mkws.registerWidgetType('config', function() {
+ var c = this.config;
+ for (var name in c) {
+ if (c.hasOwnProperty(name)) {
+ this.team.config[name] = c[name];
+ this.log(this + " copied property " + name + "='" + c[name] + "' up to team");
}
+ }
});
-mkws.registerWidgetType('MOTD', function() {
- var container = this.team.widget('MOTDContainer');
- if (container) {
- // Move the MOTD from the provided element down into the container
- $(this.node).appendTo(container.node);
- }
+mkws.registerWidgetType('progress', function() {
+ var that = this;
+ this.node.hide();
+ this.team.queue("stat").subscribe(function(data) {
+ var template = that.team.loadTemplate(that.config.template || "progress");
+ that.node.html(template({
+ done: data.clients - data.activeclients,
+ waiting: data.activeclients
+ }));
+ that.node.show();
+ });
});
@@ -420,13 +382,9 @@ mkws.registerWidgetType('MOTD', function() {
// no actual functionality. We register these to prevent ignorable
// warnings when they occur.
-mkws.registerWidgetType('Query', function() {});
-mkws.registerWidgetType('MOTDContainer', function() {});
-mkws.registerWidgetType('Button', function() {});
-mkws.registerWidgetType('Popup', function() {});
+mkws.registerWidgetType('query', function() {});
+mkws.registerWidgetType('motd-container', function() {});
+mkws.registerWidgetType('button', function() {});
+
-// Not sure whether the following should have functionality:
-// Select HTMLFormElement
-// *-Container-wide HTMLTableCellElement
-// *-Container-narrow HTMLDivElement
-// Bytarget HTMLDivElement
+})(mkws.$); // jQuery wrapper