X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=0ee99f3c8973cc11bd246a53e3179fe1cf5073e4;hb=23bacc1691b42d9b2e131b7f47c9fcb2f72e3e6f;hp=fce4779e0b556e8c3de9758186970e1c70dbd166;hpb=696d1d9e680bfb287e5347134768f5d0e8c10567;p=mkws-moved-to-github.git

diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index fce4779..0ee99f3 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;
 
@@ -25,22 +27,22 @@ mkws.registerWidgetType('Targets', function() {
       cleandata.push(cur);
     }
 
-    var template = that.team.loadTemplate(that.config.template || "Targets");
+    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;
 
@@ -81,12 +83,12 @@ 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() {
+mkws.registerWidgetType('details', function() {
   var that = this;
   var recid = that.node.attr("data-mkws-recid");
   if (this.team.gotRecords()) { 
@@ -99,14 +101,14 @@ mkws.registerWidgetType('Details', function() {
   this.team.queue("record").subscribe(function(data) {
     console.log(data);
     if ($.inArray(recid, data.recid) > -1) {
-      var template = that.team.loadTemplate(that.config.template || "Record");
+      var template = that.team.loadTemplate(that.config.template || "details");
       that.node.html(template(data));
     }
   });
   that.autosearch();
 });
 
-mkws.registerWidgetType('Records', function() {
+mkws.registerWidgetType('records', function() {
   var that = this;
   var team = this.team;
 
@@ -116,7 +118,7 @@ mkws.registerWidgetType('Records', function() {
       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 = "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
@@ -124,11 +126,10 @@ mkws.registerWidgetType('Records', function() {
       if (hit.recid == team.currentRecordId()) {
         if (team.currentRecordData()) {
           hit.renderedDetails = team.renderDetails(team.currentRecordData());
-          console.log(hit.renderedDetails); 
         } 
       }
     }
-    var template = team.loadTemplate(that.config.template || "Records");
+    var template = team.loadTemplate(that.config.template || "records");
     var targs = $.extend({}, {"hits": data.hits}, that.config.template_vars);
     that.node.html(template(targs));
   });
@@ -137,7 +138,7 @@ mkws.registerWidgetType('Records', function() {
 });
 
 
-mkws.registerWidgetType('Navi', function() {
+mkws.registerWidgetType('navi', function() {
   var that = this;
   var teamName = this.team.name();
 
@@ -161,7 +162,7 @@ mkws.registerWidgetType('Navi', function() {
       output.filters.push(cur);
     });
 
-    var template = that.team.loadTemplate(that.config.template || "Navi");
+    var template = that.team.loadTemplate(that.config.template || "navi");
     that.node.html(template(output));
   });
 });
@@ -170,7 +171,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() {
@@ -183,7 +184,7 @@ mkws.registerWidgetType('Sort', function() {
 });
 
 
-mkws.registerWidgetType('Perpage', function() {
+mkws.registerWidgetType('per-page', function() {
   var that = this;
 
   this.node.change(function() {
@@ -196,54 +197,54 @@ mkws.registerWidgetType('Perpage', function() {
 });
 
 
-mkws.registerWidgetType('Done', function() {
+mkws.registerWidgetType('done', function() {
   var that = this;
   this.team.queue("complete").subscribe(function(n) {
-    var template = that.team.loadTemplate(that.config.template || "Done");
+    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();
   var output = {};
   output.recordClick = "mkws.switchView(\'" + tname + "\', \'records\')";
   output.targetClick = "mkws.switchView(\'" + tname + "\', \'targets\')";
-  var template = this.team.loadTemplate(this.config.template || "Switch");
+  var template = this.team.loadTemplate(this.config.template || "switch");
   this.node.html(template(output));
   this.hideWhenNarrow();
 });
 
 
-mkws.registerWidgetType('Search', function() {
+mkws.registerWidgetType('search', function() {
   var output = {};
   output.team = this.team.name();
   output.queryWidth = this.config.query_width;
-  var template = this.team.loadTemplate(this.config.template || "Search");
+  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 template = this.team.loadTemplate(this.config.template || "Results");
+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() {
+mkws.registerWidgetType('ranking', function() {
   var output = {};
   output.perPage = [];
   output.sort = [];
@@ -271,12 +272,12 @@ mkws.registerWidgetType('Ranking', function() {
     output.perPage.push(cur);
   }
 
-  var template = this.team.loadTemplate(this.config.template || "Ranking");
+  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;
@@ -313,7 +314,7 @@ mkws.registerWidgetType('Lang', function() {
 
   this.log("language menu: " + list.join(", "));
 
-  var template = this.team.loadTemplate(this.config.template || "Lang");
+  var template = this.team.loadTemplate(this.config.template || "lang");
   this.node.html(template({languages: list}));
   this.hideWhenNarrow();
 
@@ -338,8 +339,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);
@@ -351,7 +352,7 @@ 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)) {
@@ -362,11 +363,11 @@ mkws.registerWidgetType('Config', function() {
 });
 
 
-mkws.registerWidgetType('Progress', function() {
+mkws.registerWidgetType('progress', function() {
   var that = this;
   this.node.hide();
   this.team.queue("stat").subscribe(function(data) {
-    var template = that.team.loadTemplate(that.config.template || "Progress");
+    var template = that.team.loadTemplate(that.config.template || "progress");
     that.node.html(template({
       done: data.clients - data.activeclients,
       waiting: data.activeclients
@@ -381,8 +382,9 @@ mkws.registerWidgetType('Progress', function() {
 // 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