X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=446fe75c463a490f08e3333f34cad28ee24b3483;hp=35cfb16ff2d20c3d8528bbc0cfa48f32ab834055;hb=4ac151034e2dd7ddc8b0732aa575c8486cb449f0;hpb=b36da4a84d0742c0fce7d0f4891f078aa230079e
diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index 35cfb16..446fe75 100644
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -1,9 +1,11 @@
+(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() {
+mkws.registerWidgetType('targets', function() {
if (!this.config.show_switch) return;
var that = this;
@@ -17,30 +19,34 @@ mkws.registerWidgetType('Targets', function() {
var cleandata = [];
for (var i = 0; i < data.length; i++) {
var cur = {};
+ cur.name = data[i].name;
cur.id = data[i].id;
cur.hits = data[i].hits;
cur.diagnostic = data[i].diagnostic;
+ cur.message = data[i].message;
cur.records = data[i].records;
- cur.state = data[i].state;
+ cur.state = data[i].state.replace(/^Client_/, '');
cleandata.push(cur);
}
- var template = that.team.loadTemplate(that.config.template || "Targets");
+ cleandata.sort(function(a,b) { return a.name.localeCompare(b.name) });
+
+ var template = that.team.loadTemplate(that.config.template || "targets");
that.node.html(template({data: cleandata}));
});
});
-mkws.registerWidgetType('Stat', function() {
+mkws.registerWidgetType('stat', function() {
var that = this;
this.team.queue("stat").subscribe(function(data) {
- var template = that.team.loadTemplate(that.config.template || "Stat");
+ var template = that.team.loadTemplate(that.config.template || "stat");
that.node.html(template(data));
});
});
-mkws.registerWidgetType('Pager', function() {
+mkws.registerWidgetType('pager', function() {
var that = this;
var M = mkws.M;
@@ -53,7 +59,7 @@ mkws.registerWidgetType('Pager', function() {
output.found = data.total;
//client indexes pages from 1 but pz2 from 0
- var onsides = 6;
+ var onsides = 5;
var pages = Math.ceil(that.team.totalRecordCount() / that.team.perpage());
var currentPage = that.team.currentPage();
@@ -81,66 +87,139 @@ mkws.registerWidgetType('Pager', function() {
if (pages - currentPage > 0) output.nextClick = "mkws.pagerNext(\'" + teamName + "\')";
- var template = that.team.loadTemplate(that.config.template || "Pager");
+ var template = that.team.loadTemplate(that.config.template || "pager");
that.node.html(template(output));
});
});
+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) {
+ if ($.inArray(recid, data.recid) > -1) {
+ var template = that.team.loadTemplate(that.config.template || "details");
+ that.node.html(template(data));
+ }
+ });
+});
-mkws.registerWidgetType('Records', function() {
+mkws.registerWidgetType('records', function() {
var that = this;
var team = this.team;
+ var m_data;
+ var m_needRedraw = false;
+ var m_frozen = false;
+
+ this.team.queue("searchtriggered").subscribe(function() {
+ var op = that.config.newsearch_opacity;
+ if (op !== undefined) { that.node.fadeTo(500, op); }
+ });
- 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 = "mkwsSummary mkwsTeam_" + 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());
- console.log(hit.renderedDetails);
- }
+ function refreshRecordData() {
+ that.node.css('opacity', 1);
+
+ if (m_needRedraw) {
+ for (var i = 0; i < m_data.hits.length; i++) {
+ var hit = m_data.hits[i];
+ 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 summaryPartial = team.loadTemplate(that.config['summary-template'] || "summary");
+ var tdata = $.extend({}, {"hits": m_data.hits}, that.config.template_vars);
+ that.node.html(template(tdata, {"partials":{"summary":summaryPartial}}));
+ }
+
+ m_needRedraw = false;
+ }
+
+ function setRecordData(data) {
+ m_data = data;
+ m_needRedraw = true;
+ if (!m_frozen) {
+ refreshRecordData();
}
- var template = team.loadTemplate(that.config.template || "Records");
- var targs = $.extend({}, {"hits": data.hits}, that.config.template_vars);
- that.node.html(template(targs));
+ }
+
+ this.team.queue("records").subscribe(setRecordData);
+
+ this.node.mousemove(function() {
+ that.info("freezing display records");
+ that.node.css('opacity', 0.5);
+ m_frozen = true;
});
+ this.node.mouseleave(function() {
+ that.info("refreshing records");
+ that.node.css('opacity', 1);
+ m_frozen = false;
+ refreshRecordData();
+ });
+
+/*
+ var m_busy = false;
+ this.node.mousemove(function() {
+ if (!m_busy) {
+ m_busy = true;
+ that.info("making semi-transparent in 0.001 s");
+ that.node.fadeTo(1, 0.5, function() {
+ that.info("making opaque in 2 s");
+ that.node.fadeTo(2000, 1, function() {
+ that.info("done making opaque");
+ m_busy = false;
+ });
+ });
+ }
+ });
+*/
+
that.autosearch();
});
-mkws.registerWidgetType('Navi', function() {
+mkws.registerWidgetType('navi', function() {
var that = this;
var teamName = this.team.name();
- var M = mkws.M;
- this.team.queue("navi").subscribe(function() {
+ this.team.queue("searchtriggered").subscribe(function() {
var filters = that.team.filters();
- var text = "";
+ var output = {filters:[]};
filters.visitTargets(function(id, name) {
- if (text) text += " | ";
- text += M('source') + ': ' + name + '';
+ var cur = {};
+ cur.facet = 'source';
+ cur.value = name;
+ cur.click = "mkws.delimitTarget('" + teamName + "', '" + id + "'); return false;";
+ output.filters.push(cur);
});
filters.visitFields(function(field, value) {
- if (text) text += " | ";
- text += M(field) + ': ' + value + '';
+ var cur = {};
+ cur.facet = field;
+ cur.value = value;
+ cur.click = "mkws.delimitQuery('" + teamName + "', '" + field + "', '" + value + "'" + ");return false;";
+ output.filters.push(cur);
});
- that.node.html(text);
+ var template = that.team.loadTemplate(that.config.template || "navi");
+ that.node.html(template(output));
});
});
@@ -148,7 +227,7 @@ mkws.registerWidgetType('Navi', function() {
// 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() {
+mkws.registerWidgetType('sort', function() {
var that = this;
this.node.change(function() {
@@ -161,7 +240,7 @@ mkws.registerWidgetType('Sort', function() {
});
-mkws.registerWidgetType('Perpage', function() {
+mkws.registerWidgetType('per-page', function() {
var that = this;
this.node.change(function() {
@@ -174,137 +253,86 @@ mkws.registerWidgetType('Perpage', function() {
});
-mkws.registerWidgetType('Done', function() {
+mkws.registerWidgetType('done', function() {
var that = this;
-
this.team.queue("complete").subscribe(function(n) {
- that.node.html("Search complete: found " + n + " records");
+ var template = that.team.loadTemplate(that.config.template || "done");
+ that.node.html(template({count: n}));
});
});
-mkws.registerWidgetType('Switch', function() {
+mkws.registerWidgetType('switch', function() {
if (!this.config.show_switch) return;
var tname = this.team.name();
- this.node.html('\
-Records \
-| \
-Targets');
+ 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('Search', function() {
- var tname = this.team.name();
- var M = mkws.M;
-
- this.node.html('\
-');
+mkws.registerWidgetType('search', function() {
+ var output = {};
+ output.team = this.team.name();
+ var template = this.team.loadTemplate(this.config.template || "search");
+ this.node.html(template(output));
});
-mkws.registerWidgetType('SearchForm', function() {
+mkws.registerWidgetType('search-form', function() {
var team = this.team;
this.node.submit(function() {
- var val = team.widget('Query').value();
+ var val = team.widget('query').value();
team.newSearch(val);
return false;
});
});
-mkws.registerWidgetType('Results', function() {
- var tname = this.team.name();
-
- this.node.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('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("making sort HTML, sortOrder = '" + order + "'");
- var sort_html = '';
-
- return sort_html;
+ var perpage = this.team.perpage();
+ this.info("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);
}
- function mkwsHtmlPerpage() {
- var perpage = that.team.perpage();
-
- that.log("making perpage HTML, perpage = " + perpage);
- var perpage_html = '';
-
- return perpage_html;
- }
+ var template = this.team.loadTemplate(this.config.template || "ranking");
+ this.node.html(template(output));
});
-mkws.registerWidgetType('Lang', function() {
+mkws.registerWidgetType('lang', function() {
// dynamic URL or static page? /path/foo?query=test
/* create locale language menu */
if (!this.config.show_lang) return;
@@ -314,40 +342,36 @@ mkws.registerWidgetType('Lang', function() {
var list = [];
/* display a list of configured languages, or all */
- var lang_options = this.config.lang_options || [];
+ 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)
- list.push(k);
+ 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);
+ }
}
// add english link
- if (lang_options.length == 0 || toBeIncluded[lang_default])
- list.push(lang_default);
-
- this.log("language menu: " + 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 + ' '
- }
+ 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.node.html(data);
- this.hideWhenNarrow();
+ this.info("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) {
@@ -370,8 +394,8 @@ mkws.registerWidgetType('Lang', function() {
});
-mkws.registerWidgetType('MOTD', function() {
- var container = this.team.widget('MOTDContainer');
+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);
@@ -383,44 +407,57 @@ mkws.registerWidgetType('MOTD', function() {
// is copied up into its team, allowing it to affect other widgets in
// the team.
//
-mkws.registerWidgetType('Config', function() {
+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");
+ this.info(this + " copied property " + name + "='" + c[name] + "' up to team");
}
}
});
-mkws.registerWidgetType('Progress', function() {
+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);
+ var template = that.team.loadTemplate(that.config.template || "progress");
+ that.node.html(template({
+ done: data.clients - data.activeclients,
+ waiting: data.activeclients
+ }));
that.node.show();
});
});
+mkws.registerWidgetType('waiting', function() {
+ var that = this;
+
+ this.node.css("visibility", "hidden");
+ var template = that.team.loadTemplate(that.config.template || "waiting");
+ this.node.html(template({
+ src: this.config.src || "http://mkws.indexdata.com/progress.gif"
+ }));
+
+ this.team.queue("searchtriggered").subscribe(function(data) {
+ that.node.css("visibility", "visible");
+ });
+ this.team.queue("complete").subscribe(function(n) {
+ that.node.css("visibility", "hidden");
+ });
+});
+
+
// 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
// warnings when they occur.
-mkws.registerWidgetType('Query', function() {});
-mkws.registerWidgetType('MOTDContainer', function() {});
-mkws.registerWidgetType('Button', function() {});
+mkws.registerWidgetType('query', function() {});
+mkws.registerWidgetType('motd-container', function() {});
+mkws.registerWidgetType('button', function() {});
+})(mkws.$); // jQuery wrapper