From 7508a91294fa89cb3f57218eefd7f0354df81ea4 Mon Sep 17 00:00:00 2001 From: Jason Skomorowski Date: Fri, 8 Aug 2014 14:53:58 -0400 Subject: [PATCH] Template Progress widget. --- src/mkws-handlebars.js | 8 ++++++++ src/mkws-widget-main.js | 16 +++++----------- src/mkws-widget-main.templates/Progress.handlebars | 11 +++++++++++ 3 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 src/mkws-widget-main.templates/Progress.handlebars diff --git a/src/mkws-handlebars.js b/src/mkws-handlebars.js index 866dc8a..bd9af8d 100644 --- a/src/mkws-handlebars.js +++ b/src/mkws-handlebars.js @@ -96,3 +96,11 @@ Handlebars.registerHelper('mkws-commaList', function(items, options) { Handlebars.registerHelper('mkws-index1', function(obj) { return obj.data.index + 1; }); + +Handlebars.registerHelper('mkws-repeat', function(count, options) { + var out = ""; + for (var i = 0; i < count; i++) { + out += options.fn(this); + } + return out; +}); diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js index f76edbc..ffe00d6 100644 --- a/src/mkws-widget-main.js +++ b/src/mkws-widget-main.js @@ -342,19 +342,13 @@ mkws.registerWidgetType('Config', 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 = this.team.loadTemplate(this.config.template || "Progress"); + this.node.html(template({ + done: data.clients - data.activeclients, + waiting: data.activeclients + })); that.node.show(); }); }); diff --git a/src/mkws-widget-main.templates/Progress.handlebars b/src/mkws-widget-main.templates/Progress.handlebars new file mode 100644 index 0000000..1b08a2c --- /dev/null +++ b/src/mkws-widget-main.templates/Progress.handlebars @@ -0,0 +1,11 @@ +{{! +Progress + +done - number of targets complete +waiting - number of targets waiting +}} +{{#mkws-repeat done}}█{{/mkws-repeat}} +{{~#if waiting~}} +{{#mkws-repeat waiting}}█{{/mkws-repeat}} +{{~/if~}} + -- 1.7.10.4