goat 0.3.10 → 0.3.11

data/goat.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'goat'
-  s.version = '0.3.10'
+  s.version = '0.3.11'
   s.summary = 'Pre-release beta version of Goat'
   s.author = 'Patrick Collison'
   s.email = 'patrick@collison.ie'

data/lib/goat/goat.js

@@ -170,14 +170,6 @@ var GoatRT = {
     }
   }
 
-  function showSpinner() {
-    $("#menu").prepend(GoatRT.spinner);
-  }
-
-  function hideSpinner() {
-    $("#spinner").remove();
-  }
-
   function newTxn() {
     var op = new RTTxn();
     rt.ops[op.code] = op;
@@ -199,9 +191,10 @@ var GoatRT = {
       delete rt.pendingTxns[txn];
 
       if(pendingCount() == 0) {
-        if(!txn.start) hideSpinner();
-        if(txn.complete) txn.complete();
+        LoadingIndicator.hide();
       }
+
+      if(txn.complete) txn.complete();
     } else {
       console.error("Can't complete txn " + txn + ": no such txn was started");
     }
@@ -218,12 +211,44 @@ var GoatRT = {
   rt.newTxn = newTxn;
   rt.beginTxn = beginTxn;
   rt.txnCompleteMsg = txnCompleteMsg;
-  rt.spinner = $("<img id=\"spinner\" src=\"/static/img/spinner.gif\">");
-  rt.showSpinner = showSpinner;
 
   return rt;
 })(GoatRT);
 
+var LoadingIndicator = {
+  url: null,
+  indicator: null,
+  where: null,
+  indicatorActive: false
+};
+
+(function(ld) {
+  function initIndicator() {
+    if(!ld.url || !ld.where) console.error("Loading indicator not configured");
+    ld.indicator = $("<img id=\"loading_indicator\" src=\"" + ld.url + "\">");
+  }
+
+  function show() {
+    ld.indicatorActive = true;
+    $(ld.where).prepend(ld.indicator);
+  }
+
+  function hide() {
+    if(ld.indicatorActive)
+      ld.indicator.remove();
+  }
+
+  $(document).ready(function() {
+    initIndicator();
+    new Image(ld.url);
+  });
+
+  ld.show = show;
+  ld.hide = hide;
+
+  return ld;
+})(LoadingIndicator);
+
 var RTTxn = Class.extend({
   init: function() {
     this.code = String.random(8, 'txn');
@@ -306,7 +331,7 @@ var GoatRPC = Class.extend({
     }
 
     if(this.start) this.start()
-    else if(this.rt) GoatRT.showSpinner();
+    else if(this.rt) LoadingIndicator.show();
 
     $.ajax({
       type: 'POST',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 3
-  - 10
-  version: 0.3.10
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Patrick Collison