set some sensible timeouts for servers that hang on requests to weird…

… ports
max-mapper · May 29, 2011 · dd09112 · dd09112
1 parent a067b81
commit dd09112
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/assets/jquery.couch2.js b/assets/jquery.couch2.js
@@ -37,7 +37,8 @@
       designDocs: function(opts) {
         return makeRequest($.extend(defaults, {
           url: this.uri + "_all_docs",
-          data: {startkey:'"_design/"', endkey:'"_design0"', include_docs:true}
+          data: {startkey:'"_design/"', endkey:'"_design0"', include_docs:true},
+          timeout: 20000
         }));
       }
 

diff --git a/background.html b/background.html
@@ -5,7 +5,8 @@
       success: function(data){callback({data: data, ok: true})},
       error: function(error){callback({data: error, ok: false})},
       dataType: "json",
-      contentType: "application/json"
+      contentType: "application/json",
+      timeout: 5000
     }
     $.extend(reqOpts, options);
     $.ajax(reqOpts);

diff --git a/popup.html b/popup.html
@@ -132,9 +132,10 @@
     var currentPage;
     chrome.tabs.getSelected(null, function(tab) {
       currentPage = parseCouchApp(tab.url);
-      render('loading', 'container', {data: {host: currentPage.host}});
+      render('loading', 'container', {data: {message: "Detecting CouchDB on " + currentPage.host + "..."}});
       checkForCouch(currentPage.host, function(exists) {
         if(exists) {
+          render('loading', 'container', {data: {message: "Found CouchDB! Detecting couchapps on " + currentPage.host + "..."}});
           var couchData = new CouchData(currentPage.host + ":5984");
           couchData.loadDatabases().then(function (databases) {          
             var list = [];
@@ -156,7 +157,7 @@
           });
         } else {
           render('form', 'container');
-          $('#notification').append("no exist");
+          $('#notification').append("CouchDB not found here :(");
         }
       })
     });
@@ -185,7 +186,7 @@ <h1 class="title">Couch Replicator</h1>
   <script id="loadingTemplate" type="text/mustache">
     <div class="loading">
       <img alt="Ajax-loader" id="spinner" src="assets/ajax-loader.gif" /> 
-      <span class="instructions">Detecting couchapps on {{host}}...</span>
+      <span class="instructions">{{message}}</span>
     </div>
   </script>