X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=5ddb0b331ba602ccfe5aaaac79445038638bc6e6;hp=09565acf5338b39af00eb8c3c05cf86b22e3f092;hb=df2f50cc8902ba381b25d9123e81e97ee3d4a97b;hpb=c4d61cbf6b79b6dcf958aa03bf1c18b8f536d3cb diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js index 09565ac..5ddb0b3 100644 --- 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 = {}; - cur.id = that.team.targetName(data[i].id); + 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); } + 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})); }); @@ -111,7 +114,13 @@ mkws.registerWidgetType('records', function() { var that = this; var team = this.team; + this.team.queue("searchtriggered").subscribe(function() { + var op = that.config['new-search-opacity']; + if (op !== undefined) { that.node.fadeTo(500, op); } + }); + 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]); @@ -256,7 +265,7 @@ mkws.registerWidgetType('ranking', function() { 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); }