From 5fcf5aa480756bf4709335862d6188e1e7b36509 Mon Sep 17 00:00:00 2001
From: Mike Enriquez <mike@enriquez.me>
Date: Mon, 21 Apr 2014 17:06:02 -0400
Subject: [PATCH] Timeout Blockchain.info after 5 seconds

---
 app/index.html                                   | 2 +-
 app/js/models/block_height.js                    | 9 +++++----
 app/vendor/bitcoin_network/src/blockchaininfo.js | 3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/index.html b/app/index.html
index 6e83932..8fccd29 100644
--- a/app/index.html
+++ b/app/index.html
@@ -488,7 +488,6 @@ <h4 class="modal-title" id="myModalLabel">Welcome to Coin Pocket <small class="n
     <script src="/js/views/connection_status_view.js"></script>
     <script src="/js/controllers/welcome_modal_controller.js"></script>
     <script src="/js/controllers/browser_controller.js"></script>
-    <script src="/js/controllers/balance_controller.js"></script>
     <script src="/js/controllers/empty_state_controller.js"></script>
     <script src="/js/controllers/confirmation_controller.js"></script>
     <script src="/js/controllers/send_controller.js"></script>
@@ -496,6 +495,7 @@ <h4 class="modal-title" id="myModalLabel">Welcome to Coin Pocket <small class="n
     <script src="/js/controllers/receive_controller.js"></script>
     <script src="/js/controllers/transaction_controller.js"></script>
     <script src="/js/controllers/connection_status_controller.js"></script>
+    <script src="/js/controllers/balance_controller.js"></script>
     <script src="/js/controllers/main_controller.js"></script>
     <!-- /build -->
 
diff --git a/app/js/models/block_height.js b/app/js/models/block_height.js
index 2838bf6..b9a7eee 100644
--- a/app/js/models/block_height.js
+++ b/app/js/models/block_height.js
@@ -21,6 +21,11 @@
   BlockHeight.prototype.beginPolling = function() {
     var self = this;
 
+    // try to get the block height ASAP
+    BitcoinNetwork.currentBlockHeight(function(height) {
+      self._triggerNewBlock(height);
+    });
+
     // the socket doesn't always notify us, so we'll poll for it every 15 seconds :(
     // it doesn't always give us the latest block height either :(
     self.socket.onConnectSuccess(function() {
@@ -31,10 +36,6 @@
     });
 
     self.socket.onReconnectFailure(function() {
-      BitcoinNetwork.currentBlockHeight(function(height) {
-        self._triggerNewBlock(height);
-      });
-
       setInterval(function() {
         BitcoinNetwork.currentBlockHeight(function(height) {
           self._triggerNewBlock(height);
diff --git a/app/vendor/bitcoin_network/src/blockchaininfo.js b/app/vendor/bitcoin_network/src/blockchaininfo.js
index b4859b3..e7c4715 100644
--- a/app/vendor/bitcoin_network/src/blockchaininfo.js
+++ b/app/vendor/bitcoin_network/src/blockchaininfo.js
@@ -5,6 +5,7 @@ var BlockChainInfo = (function(self, $) {
     $.ajax({
       type: 'GET',
       url: url,
+      timeout: 5000,
       data: { cors: 'true', format: 'json' },
       success: function(data) {
         hollaback(data, true);
@@ -24,6 +25,7 @@ var BlockChainInfo = (function(self, $) {
     $.ajax({
       type: 'GET',
       url: url,
+      timeout: 5000,
       data: { cors: 'true', format: 'json' },
       success: function(data) {
         hollaback(data, true);
@@ -45,6 +47,7 @@ var BlockChainInfo = (function(self, $) {
     $.ajax({
       type: 'POST',
       url: url,
+      timeout: 5000,
       data: postData,
       success: function(res) {
         hollaback(true, true);