Merge branch 'master' into urlstate

[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 81b71c7..355d8d7 100644 (file)
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -73,19 +73,19 @@ mkws.registerWidgetType('pager', function() {
     if (firstClkbl > 1) output.morePrev = true;
     if (lastClkbl < pages) output.moreNext = true;
 
-    if (currentPage > 1) output.prevClick = "mkws.pagerPrev(\'" + teamName + "\');";
+    if (currentPage > 1) output.prevHref = '#' + that.team.urlFragment({ page: currentPage-1 });
 
     output.pages = [];
     for(var i = firstClkbl; i <= lastClkbl; i++) {
       var o = {};
       o.number = i;
       if (i !== currentPage) {
-        o.click = "mkws.showPage(\'" + teamName + "\', " + i + ");";
+        o.href = '#' + that.team.urlFragment({ page: i });
       }
       output.pages.push(o);
     }
 
-    if (pages - currentPage > 0) output.nextClick = "mkws.pagerNext(\'" + teamName + "\')";
+    if (pages - currentPage > 0) output.nextHref = '#' + that.team.urlFragment({ page: currentPage+1 });
 
     var template = that.team.loadTemplate(that.config.template || "pager");
     that.node.html(template(output));
@@ -115,33 +115,82 @@ mkws.registerWidgetType('records', function() {
   var team = this.team;
 
   this.team.queue("searchtriggered").subscribe(function() {
-    var op = that.config['newsearch_opacity'];
+    var op = that.config.newsearch_opacity;
     if (op !== undefined) { that.node.fadeTo(500, op); }
   });
 
-  this.team.queue("records").subscribe(function(data) {
+  var m_dataToRedraw = null;
+  function refreshRecordData() {
+    that.node.stop();
     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]);
-      hit.detailClick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;";
-      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
-      // from the team object into this widget.
-      if (hit.recid == team.currentRecordId()) {
-        if (team.currentRecordData()) {
-          hit.renderedDetails = team.renderDetails(team.currentRecordData());
-        } 
+
+    if (m_dataToRedraw) {
+      for (var i = 0; i < m_dataToRedraw.hits.length; i++) {
+        var hit = m_dataToRedraw.hits[i];
+        hit.detailLinkId = team.recordElementId(hit.recid[0]);
+        hit.detailClick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;";
+        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
+        // from the team object into this widget.
+        if (hit.recid == team.currentRecordId()) {
+          if (team.currentRecordData()) {
+            hit.renderedDetails = team.renderDetails(team.currentRecordData());
+          } 
+        }
+
+        var urls = hit['md-electronic-url'];
+        var bestLink = null;
+        var otherLinks = [];
+        for (var j = 0; j < urls.length; j++) {
+          var url = urls[j];
+          if (!url.match(/^(https?:)?\/\//)) {
+            that.warn("link '" + url + "' is not a valid URL");
+          } else if (!bestLink) {
+            bestLink = url;
+          } else {
+            otherLinks.push(url);
+          }
+        }
+        hit.bestLink = bestLink;
+        hit.otherLinks = otherLinks;
       }
+
+      var template = team.loadTemplate(that.config.template || "records");
+      var summaryPartial = team.loadTemplate(that.config['summary-template'] || "summary");
+      var tdata = $.extend({}, {"hits": m_dataToRedraw.hits}, that.config.template_vars);
+      that.node.html(template(tdata, {"partials":{"summary":summaryPartial}}));
+    }
+
+    m_dataToRedraw = null;
+  }
+
+  var m_frozen = false;
+  this.team.queue("records").subscribe(function(data) {
+    m_dataToRedraw = data;
+    if (!m_frozen) {
+      refreshRecordData();
     }
-    var template = team.loadTemplate(that.config.template || "records");
-    var summaryPartial = team.loadTemplate(that.config['summary-template'] || "summary");
-    var tdata = $.extend({}, {"hits": data.hits}, that.config.template_vars);
-    that.node.html(template(tdata, {"partials":{"summary":summaryPartial}}));
   });
 
+  var m_timer;
+  this.node.mousemove(function() {
+    var op = that.config.freeze_opacity;
+    if (op !== undefined) { that.node.css('opacity', op); }
+    m_frozen = true;
+    clearTimeout(m_timer);
+    m_timer = setTimeout(unfreezeRecordDisplay, 1000);
+  });
+
+  function unfreezeRecordDisplay() {
+    clearTimeout(m_timer);
+    that.node.css('opacity', 1);
+    m_frozen = false;
+    refreshRecordData();
+  }
+  this.node.mouseleave(unfreezeRecordDisplay);
+
   that.autosearch();
 });
 
@@ -183,10 +232,7 @@ mkws.registerWidgetType('sort', function() {
   var that = this;
 
   this.node.change(function() {
-    that.team.set_sortOrder(that.node.val());
-    if (that.team.submitted()) {
-      that.team.reShow();
-    }
+    window.location.href = '#' + that.team.urlFragment({ sort: that.node.val() });
     return false;
   });
 });
@@ -196,10 +242,7 @@ mkws.registerWidgetType('per-page', function() {
   var that = this;
 
   this.node.change(function() {
-    that.team.set_perpage(that.node.val());
-    if (that.team.submitted()) {
-      that.team.reShow();
-    }
+    window.location.href = '#' + that.team.urlFragment({ size: that.node.val() });
     return false;
   });
 });
@@ -384,6 +427,24 @@ mkws.registerWidgetType('progress', function() {
 });
 
 
+mkws.registerWidgetType('waiting', function() {
+  var that = this;
+
+  this.node.css("visibility", "hidden");
+  var template = that.team.loadTemplate(that.config.template || "waiting");
+  this.node.html(template({
+    src: this.config.src || "http://mkws.indexdata.com/progress.gif"
+  }));
+
+  this.team.queue("searchtriggered").subscribe(function(data) {
+    that.node.css("visibility", "visible");
+  });
+  this.team.queue("complete").subscribe(function(n) {
+    that.node.css("visibility", "hidden");
+  });
+});
+
+
 // 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