X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=3761752ad4003164d347fd145b64275306acbc79;hb=b347eef13c87c5cdeb57a504fb3a927a2388310d;hp=51bd5c159951e871f2fa0605ade1b91271c54c9f;hpb=d5b0c54c73c244c321cbbb87b5686267f46e5535;p=mkws-moved-to-github.git
diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index 51bd5c1..3761752 100644
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -4,11 +4,12 @@
mkws.registerWidgetType('Targets', function() {
+ if (!this.config.show_switch) return;
var that = this;
var M = mkws.M;
- $(this.node).html('No information available yet.');
- $(this.node).css("display", "none");
+ this.node.html('No information available yet.');
+ this.node.css("display", "none");
this.team.queue("targets").subscribe(function(data) {
var table ='
' +
@@ -28,7 +29,7 @@ mkws.registerWidgetType('Targets', function() {
}
table += '
';
- $(that.node).html(table);
+ that.node.html(table);
});
});
@@ -38,13 +39,10 @@ mkws.registerWidgetType('Stat', function() {
var M = mkws.M;
this.team.queue("stat").subscribe(function(data) {
- if (that.node.length === 0) alert("huh?!");
-
- $(that.node).html('' + M('Status info') + ' ' +
- ' -- ' +
+ that.node.html(' -- ' +
'' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + ' ' +
' -- ' +
- '' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + ' ');
+ M('Retrieved records') + ': ' + data.records + '/' + data.hits);
});
});
@@ -54,7 +52,7 @@ mkws.registerWidgetType('Pager', function() {
var M = mkws.M;
this.team.queue("pager").subscribe(function(data) {
- $(that.node).html(drawPager(data))
+ that.node.html(drawPager(data))
function drawPager(data) {
var teamName = that.team.name();
@@ -123,7 +121,7 @@ mkws.registerWidgetType('Records', function() {
var hit = data.hits[i];
that.team.queue("record").publish(hit);
var divId = team.recordElementId(hit.recid[0]);
- html.push('', renderSummary(hit), '
');
+ 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.
@@ -132,7 +130,7 @@ mkws.registerWidgetType('Records', function() {
html.push(team.renderDetails(team.currentRecordData()));
}
}
- $(that.node).html(html.join(''));
+ that.node.html(html.join(''));
function renderSummary(hit) {
var template = team.loadTemplate(that.config.template || "Summary");
@@ -142,7 +140,7 @@ mkws.registerWidgetType('Records', function() {
}
});
- widget.autosearch(that);
+ that.autosearch();
});
@@ -168,7 +166,7 @@ mkws.registerWidgetType('Navi', function() {
');return false;">' + value + '';
});
- $(that.node).html(text);
+ that.node.html(text);
});
});
@@ -179,8 +177,8 @@ mkws.registerWidgetType('Navi', function() {
mkws.registerWidgetType('Sort', function() {
var that = this;
- $(this.node).change(function() {
- that.team.set_sortOrder($(that.node).val());
+ this.node.change(function() {
+ that.team.set_sortOrder(that.node.val());
if (that.team.submitted()) {
that.team.reShow();
}
@@ -192,8 +190,8 @@ mkws.registerWidgetType('Sort', function() {
mkws.registerWidgetType('Perpage', function() {
var that = this;
- $(this.node).change(function() {
- that.team.set_perpage($(that.node).val());
+ this.node.change(function() {
+ that.team.set_perpage(that.node.val());
if (that.team.submitted()) {
that.team.reShow();
}
@@ -206,18 +204,19 @@ mkws.registerWidgetType('Done', function() {
var that = this;
this.team.queue("complete").subscribe(function(n) {
- $(that.node).html("Search complete: found " + n + " records");
+ that.node.html("Search complete: found " + n + " records");
});
});
mkws.registerWidgetType('Switch', function() {
+ if (!this.config.show_switch) return;
var tname = this.team.name();
- $(this.node).html('\
+ this.node.html('\
Records \
| \
Targets ');
- widget.hideWhenNarrow(this);
+ this.hideWhenNarrow();
});
@@ -225,7 +224,7 @@ mkws.registerWidgetType('Search', function() {
var tname = this.team.name();
var M = mkws.M;
- $(this.node).html('\
+ this.node.html('\
';
- $(this.node).html(s);
+ this.node.html(s);
function mkwsHtmlSort() {
var order = that.team.sortOrder();
- that.log("HTML sort, sortOrder = '" + order + "'");
+ that.log("making sort HTML, sortOrder = '" + order + "'");
var sort_html = '';
for(var i = 0; i < that.config.sort_options.length; i++) {
@@ -312,7 +311,7 @@ mkws.registerWidgetType('Ranking', function() {
function mkwsHtmlPerpage() {
var perpage = that.team.perpage();
- that.log("HTML perpage, perpage = " + perpage);
+ that.log("making perpage HTML, perpage = " + perpage);
var perpage_html = '';
for(var i = 0; i < that.config.perpage_options.length; i++) {
@@ -356,7 +355,7 @@ mkws.registerWidgetType('Lang', function() {
if (lang_options.length == 0 || toBeIncluded[lang_default])
list.push(lang_default);
- this.log("Language menu for: " + list.join(", "));
+ this.log("language menu: " + list.join(", "));
/* the HTML part */
var data = "";
@@ -372,8 +371,8 @@ mkws.registerWidgetType('Lang', function() {
}
}
- $(this.node).html(data);
- widget.hideWhenNarrow(this);
+ this.node.html(data);
+ this.hideWhenNarrow();
// set or re-set "lang" URL parameter
@@ -401,11 +400,46 @@ 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);
+ this.node.appendTo(container.node);
}
});
+// 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('Progress', function() {
+ var that = this;
+
+ this.node.hide();
+ this.team.queue("stat").subscribe(function(data) {
+ var s = '';
+ for (var i = 0; i < data.clients; i++) {
+ if (i == data.clients - data.activeclients) {
+ s += ' ';
+ s += '';
+ }
+ s += '█';
+ }
+ s += ' ';
+ that.node.html(s);
+ that.node.show();
+ });
+});
+
+
// Some elements have mkws* classes that makes them appear as widgets
// -- for example, because we want to style them using CSS -- but have
// no actual functionality. We register these to prevent ignorable