projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix spelling of newsearch_opacity property
[mkws-moved-to-github.git]
/
src
/
mkws-widget-main.js
diff --git
a/src/mkws-widget-main.js
b/src/mkws-widget-main.js
index
c1a58ef
..
81b71c7
100644
(file)
--- a/
src/mkws-widget-main.js
+++ b/
src/mkws-widget-main.js
@@
-19,15
+19,18
@@
mkws.registerWidgetType('targets', function() {
var cleandata = [];
for (var i = 0; i < data.length; i++) {
var cur = {};
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.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);
}
cleandata.push(cur);
}
+ 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}));
});
var template = that.team.loadTemplate(that.config.template || "targets");
that.node.html(template({data: cleandata}));
});
@@
-111,7
+114,13
@@
mkws.registerWidgetType('records', function() {
var that = this;
var team = this.team;
var that = this;
var team = this.team;
+ 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) {
this.team.queue("records").subscribe(function(data) {
+ that.node.css('opacity', 1);
for (var i = 0; i < data.hits.length; i++) {
var hit = data.hits[i];
hit.detailLinkId = team.recordElementId(hit.recid[0]);
for (var i = 0; i < data.hits.length; i++) {
var hit = data.hits[i];
hit.detailLinkId = team.recordElementId(hit.recid[0]);
@@
-141,7
+150,7
@@
mkws.registerWidgetType('navi', function() {
var that = this;
var teamName = this.team.name();
var that = this;
var teamName = this.team.name();
- this.team.queue("navi").subscribe(function() {
+ this.team.queue("searchtriggered").subscribe(function() {
var filters = that.team.filters();
var output = {filters:[]};
var filters = that.team.filters();
var output = {filters:[]};
@@
-251,18
+260,18
@@
mkws.registerWidgetType('ranking', function() {
output.showPerPage = this.config.show_perpage;
var order = this.team.sortOrder();
output.showPerPage = this.config.show_perpage;
var order = this.team.sortOrder();
- this.log("making sort, sortOrder = '" + order + "'");
+ this.info("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];
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];
+ cur.label = opt.length == 1 ? opt[0] : mkws.M(opt[1]);
if (order == cur.key || order == cur.label) cur.selected = true;
output.sort.push(cur);
}
var perpage = this.team.perpage();
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);
+ 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];
for(var i = 0; i < this.config.perpage_options.length; i++) {
var cur = {};
cur.perPage = this.config.perpage_options[i];
@@
-310,7
+319,7
@@
mkws.registerWidgetType('lang', function() {
list.push(cur);
}
list.push(cur);
}
- this.log("language menu: " + list.join(", "));
+ this.info("language menu: " + list.join(", "));
var template = this.team.loadTemplate(this.config.template || "lang");
this.node.html(template({languages: list}));
var template = this.team.loadTemplate(this.config.template || "lang");
this.node.html(template({languages: list}));
@@
-355,7
+364,7
@@
mkws.registerWidgetType('config', function() {
for (var name in c) {
if (c.hasOwnProperty(name)) {
this.team.config[name] = c[name];
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");
}
}
});
}
}
});