X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=85c2ba41748ab903412408758cddfe9d1924faa2;hb=9414c1ffb05c80a52d0ab39ee13889276c5a5a04;hp=41201dd87c711660cf37aa3d6e0aeb33dcaa7f0c;hpb=d2b83a91581809fa14754b891a074f102f9f3400;p=mkws-moved-to-github.git

diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index 41201dd..85c2ba4 100644
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -4,14 +4,12 @@
 
 
 mkws.registerWidgetType('Targets', function() {
+  if (!this.config.show_switch) return;
   var that = this;
   var M = mkws.M;
 
-  $(this.node).html('\
-<div class="mkwsBytarget mkwsTeam_' + this.team.name() + '">\
-No information available yet.\
-</div>');
-  $(this.node).css("display", "none");
+  this.node.html('No information available yet.');
+  this.node.css("display", "none");
 
   this.team.queue("targets").subscribe(function(data) {
     var table ='<table><thead><tr>' +
@@ -24,15 +22,14 @@ No information available yet.\
 
     for (var i = 0; i < data.length; i++) {
       table += "<tr><td>" + data[i].id +
-	"</td><td>" + data[i].hits +
-	"</td><td>" + data[i].diagnostic +
-	"</td><td>" + data[i].records +
-	"</td><td>" + data[i].state + "</td></tr>";
+        "</td><td>" + data[i].hits +
+        "</td><td>" + data[i].diagnostic +
+        "</td><td>" + data[i].records +
+        "</td><td>" + data[i].state + "</td></tr>";
     }
 
     table += '</tbody></table>';
-    var subnode = $(that.node).children('.mkwsBytarget');
-    subnode.html(table);
+    that.node.html(table);
   });
 });
 
@@ -42,13 +39,10 @@ mkws.registerWidgetType('Stat', function() {
   var M = mkws.M;
 
   this.team.queue("stat").subscribe(function(data) {
-    if (that.node.length === 0)  alert("huh?!");
-
-    $(that.node).html('<span class="head">' + M('Status info') + '</span>' +
-	              ' -- ' +
-	              '<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
-	              ' -- ' +
-	              '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
+    that.node.html(' -- ' +
+                      '<span class="mkwsClientCount">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
+                      ' -- ' +
+                      M('Retrieved records') + ': ' + data.records + '/' + data.hits);
   });
 });
 
@@ -58,14 +52,14 @@ mkws.registerWidgetType('Pager', function() {
   var M = mkws.M;
 
   this.team.queue("pager").subscribe(function(data) {
-    $(that.node).html(drawPager(data))
+    that.node.html(drawPager(data))
 
     function drawPager(data) {
       var teamName = that.team.name();
       var s = '<div style="float: right">' + M('Displaying') + ': '
-	+ (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
-	' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
-	+ data.total + ')</div>';
+        + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
+        ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
+        + data.total + ')</div>';
 
       //client indexes pages from 1 but pz2 from 0
       var onsides = 6;
@@ -73,43 +67,43 @@ mkws.registerWidgetType('Pager', function() {
       var currentPage = that.team.currentPage();
 
       var firstClkbl = (currentPage - onsides > 0)
-	? currentPage - onsides
-	: 1;
+        ? currentPage - onsides
+        : 1;
 
       var lastClkbl = firstClkbl + 2*onsides < pages
-	? firstClkbl + 2*onsides
-	: pages;
+        ? firstClkbl + 2*onsides
+        : pages;
 
       var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span> | ';
       if (currentPage > 1)
-	prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + teamName + '\');">'
-	+'&#60;&#60; ' + M('Prev') + '</a> | ';
+        prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + teamName + '\');">'
+        +'&#60;&#60; ' + M('Prev') + '</a> | ';
 
       var middle = '';
       for(var i = firstClkbl; i <= lastClkbl; i++) {
-	var numLabel = i;
-	if(i == currentPage)
-	  numLabel = '<span class="mkwsSelected">' + i + '</span>';
+        var numLabel = i;
+        if(i == currentPage)
+          numLabel = '<span class="mkwsCurrentPage">' + i + '</span>';
 
-	middle += '<a href="#" onclick="mkws.showPage(\'' + teamName + '\', ' + i + ')"> '
-	  + numLabel + ' </a>';
+        middle += '<a href="#" onclick="mkws.showPage(\'' + teamName + '\', ' + i + ')"> '
+          + numLabel + ' </a>';
       }
 
       var next = ' | <span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
       if (pages - currentPage > 0)
-	next = ' | <a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + teamName + '\')">'
-	+ M('Next') + ' &#62;&#62;</a>';
+        next = ' | <a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + teamName + '\')">'
+        + M('Next') + ' &#62;&#62;</a>';
 
       var predots = '';
       if (firstClkbl > 1)
-	predots = '...';
+        predots = '...';
 
       var postdots = '';
       if (lastClkbl < pages)
-	postdots = '...';
+        postdots = '...';
 
       s += '<div style="float: clear">'
-	+ prev + predots + middle + postdots + next + '</div>';
+        + prev + predots + middle + postdots + next + '</div>';
 
       return s;
     }
@@ -127,16 +121,16 @@ mkws.registerWidgetType('Records', function() {
       var hit = data.hits[i];
       that.team.queue("record").publish(hit);
       var divId = team.recordElementId(hit.recid[0]);
-      html.push('<div class="record mkwsTeam_' + team.name() + ' ' + divId + '">', renderSummary(hit), '</div>');
+      html.push('<div class="mkwsSummary mkwsTeam_' + team.name() + ' ' + divId + '">', renderSummary(hit), '</div>');
       // ### 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())
-	  html.push(team.renderDetails(team.currentRecordData()));
+        if (team.currentRecordData())
+          html.push(team.renderDetails(team.currentRecordData()));
       }
     }
-    $(that.node).html(html.join(''));
+    that.node.html(html.join(''));
 
     function renderSummary(hit) {
       var template = team.loadTemplate(that.config.template || "Summary");
@@ -146,7 +140,7 @@ mkws.registerWidgetType('Records', function() {
     }
   });
 
-  widget.autosearch(that);
+  that.autosearch();
 });
 
 
@@ -161,18 +155,18 @@ mkws.registerWidgetType('Navi', function() {
 
     filters.visitTargets(function(id, name) {
       if (text) text += " | ";
-      text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + teamName +
-	"', '" + id + "'" + ');return false;">' + name + '</a>';
+      text += M('source') + ': <a class="mkwsRemovable" href="#" onclick="mkws.delimitTarget(\'' + teamName +
+        "', '" + id + "'" + ');return false;">' + name + '</a>';
     });
 
     filters.visitFields(function(field, value) {
       if (text) text += " | ";
-      text += M(field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + teamName +
-	"', '" + field + "', '" + value + "'" +
-	');return false;">' + value + '</a>';
+      text += M(field) + ': <a class="mkwsRemovable" href="#" onclick="mkws.delimitQuery(\'' + teamName +
+        "', '" + field + "', '" + value + "'" +
+        ');return false;">' + value + '</a>';
     });
 
-    $(that.node).html(text);
+    that.node.html(text);
   });
 });
 
@@ -183,8 +177,8 @@ mkws.registerWidgetType('Navi', function() {
 mkws.registerWidgetType('Sort', function() {
   var that = this;
 
-  $(this.node).change(function() {
-    that.team.set_sortOrder($(that.node).val());
+  this.node.change(function() {
+    that.team.set_sortOrder(that.node.val());
     if (that.team.submitted()) {
       that.team.reShow();
     }
@@ -196,8 +190,8 @@ mkws.registerWidgetType('Sort', function() {
 mkws.registerWidgetType('Perpage', function() {
   var that = this;
 
-  $(this.node).change(function() {
-    that.team.set_perpage($(that.node).val());
+  this.node.change(function() {
+    that.team.set_perpage(that.node.val());
     if (that.team.submitted()) {
       that.team.reShow();
     }
@@ -210,18 +204,19 @@ mkws.registerWidgetType('Done', function() {
   var that = this;
 
   this.team.queue("complete").subscribe(function(n) {
-    $(that.node).html("Search complete: found " + n + " records");
+    that.node.html("Search complete: found " + n + " records");
   });
 });
 
 
 mkws.registerWidgetType('Switch', function() {
+  if (!this.config.show_switch) return;
   var tname = this.team.name();
-  $(this.node).html('\
+  this.node.html('\
 <a href="#" onclick="mkws.switchView(\'' + tname + '\', \'records\')">Records</a><span> \
 | \
 </span><a href="#" onclick="mkws.switchView(\'' + tname + '\', \'targets\')">Targets</a>');
-  widget.hideWhenNarrow(this);
+  this.hideWhenNarrow();
 });
 
 
@@ -229,7 +224,7 @@ mkws.registerWidgetType('Search', function() {
   var tname = this.team.name();
   var M = mkws.M;
 
-  $(this.node).html('\
+  this.node.html('\
 <form name="mkwsSearchForm" class="mkwsSearchForm mkwsTeam_' + tname + '" action="" >\
   <input class="mkwsQuery mkwsTeam_' + tname + '" type="text" size="' + this.config.query_width + '" />\
   <input class="mkwsButton mkwsTeam_' + tname + '" type="submit" value="' + M('Search') + '" />\
@@ -238,8 +233,8 @@ mkws.registerWidgetType('Search', function() {
 
 
 mkws.registerWidgetType('SearchForm', function() {
-  var team = this.team;    
-  $(this.node).submit(function() {
+  var team = this.team;
+  this.node.submit(function() {
     var val = team.widget('Query').value();
     team.newSearch(val);
     return false;
@@ -250,7 +245,7 @@ mkws.registerWidgetType('SearchForm', function() {
 mkws.registerWidgetType('Results', function() {
   var tname = this.team.name();
 
-  $(this.node).html('\
+  this.node.html('\
 <table width="100%" border="0" cellpadding="6" cellspacing="0">\
   <tr>\
     <td class="mkwsTermlists-Container-wide mkwsTeam_' + tname + '" width="250" valign="top">\
@@ -270,7 +265,7 @@ mkws.registerWidgetType('Results', function() {
   </tr>\
 </table>');
 
-  widget.autosearch(this);
+  this.autosearch();
 });
 
 
@@ -279,7 +274,7 @@ mkws.registerWidgetType('Ranking', function() {
   var that = this;
   var M = mkws.M;
 
-  var s = '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + tname + '" action="" >';
+  var s = '<form>';
   if (this.config.show_sort) {
     s +=  M('Sort by') + ' ' + mkwsHtmlSort() + ' ';
   }
@@ -288,13 +283,13 @@ mkws.registerWidgetType('Ranking', function() {
   }
   s += '</form>';
 
-  $(this.node).html(s);
+  this.node.html(s);
 
 
   function mkwsHtmlSort() {
     var order = that.team.sortOrder();
 
-    that.log("HTML sort, sortOrder = '" + order + "'");
+    that.log("making sort HTML, sortOrder = '" + order + "'");
     var sort_html = '<select class="mkwsSort mkwsTeam_' + tname + '">';
 
     for(var i = 0; i < that.config.sort_options.length; i++) {
@@ -304,7 +299,7 @@ mkws.registerWidgetType('Ranking', function() {
 
       sort_html += '<option value="' + key + '"';
       if (order == key || order == val) {
-	sort_html += ' selected="selected"';
+        sort_html += ' selected="selected"';
       }
       sort_html += '>' + M(val) + '</option>';
     }
@@ -316,7 +311,7 @@ mkws.registerWidgetType('Ranking', function() {
   function mkwsHtmlPerpage() {
     var perpage = that.team.perpage();
 
-    that.log("HTML perpage, perpage = " + perpage);
+    that.log("making perpage HTML, perpage = " + perpage);
     var perpage_html = '<select class="mkwsPerpage mkwsTeam_' + tname + '">';
 
     for(var i = 0; i < that.config.perpage_options.length; i++) {
@@ -324,7 +319,7 @@ mkws.registerWidgetType('Ranking', function() {
 
       perpage_html += '<option value="' + key + '"';
       if (key == perpage) {
-	perpage_html += ' selected="selected"';
+        perpage_html += ' selected="selected"';
       }
       perpage_html += '>' + key + '</option>';
     }
@@ -360,7 +355,7 @@ mkws.registerWidgetType('Lang', function() {
   if (lang_options.length == 0 || toBeIncluded[lang_default])
     list.push(lang_default);
 
-  this.log("Language menu for: " + list.join(", "));
+  this.log("language menu: " + list.join(", "));
 
   /* the HTML part */
   var data = "";
@@ -376,8 +371,8 @@ mkws.registerWidgetType('Lang', function() {
     }
   }
 
-  $(this.node).html(data);
-  widget.hideWhenNarrow(this);
+  this.node.html(data);
+  this.hideWhenNarrow();
 
 
   // set or re-set "lang" URL parameter
@@ -405,11 +400,46 @@ mkws.registerWidgetType('MOTD', function() {
   var container = this.team.widget('MOTDContainer');
   if (container) {
     // Move the MOTD from the provided element down into the container
-    $(this.node).appendTo(container.node);
+    this.node.appendTo(container.node);
   }
 });
 
 
+// This widget has no functionality of its own, but its configuration
+// is copied up into its team, allowing it to affect other widgets in
+// the team.
+//
+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");
+    }
+  }
+});
+
+
+mkws.registerWidgetType('Progress', function() {
+  var that = this;
+
+  this.node.hide();
+  this.team.queue("stat").subscribe(function(data) {
+    var s = '<span class="mkwsDone">';
+    for (var i = 0; i < data.clients; i++) {
+      if (i == data.clients - data.activeclients) {
+        s += '</span>';
+        s += '<span class="mkwsWaiting">';
+      }
+      s += '&#x2588;';
+    }
+    s += '</span>';
+    that.node.html(s);
+    that.node.show();
+  });
+});
+
+
 // 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
@@ -420,8 +450,4 @@ mkws.registerWidgetType('MOTDContainer', function() {});
 mkws.registerWidgetType('Button', function() {});
 mkws.registerWidgetType('Popup', function() {});
 
-// Not sure whether the following should have functionality:
-// Select		HTMLFormElement
-// *-Container-wide	HTMLTableCellElement
-// *-Container-narrow	HTMLDivElement
-// Bytarget		HTMLDivElement
+