rolling back progress bar change pending fix for multiple spinners

rgarcia · Apr 14, 2012 · 07a2d15 · 07a2d15
1 parent fe90484
commit 07a2d15
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/static/js/views/fullwindow.js b/static/js/views/fullwindow.js
@@ -20,7 +20,6 @@ define([
 
     onResize: function() {
       // make sure the TOC div reaches the bottom of the screen
-      console.log('[Window height: ' + $(window).height() + '.]');
       var windowHeight = $(window).height();
       this.$tocWell.height(windowHeight - 100);
 

diff --git a/static/js/views/languageview.js b/static/js/views/languageview.js
@@ -96,6 +96,7 @@ define([
           this.mainResultsView.startSpinner();
           var self = this;
           this.collection.fetch({
+/*
             xhr: function() {
               var xhr = jQuery.ajaxSettings.xhr();
               if (xhr instanceof window.XMLHttpRequest) {
@@ -108,12 +109,13 @@ define([
               }
               return xhr;
             },
+*/
             success: function(coll, resp) {
               console.log('[Success fetching ' + self.languageName + '.]');
               self.searchHeaderView.lastQuery = null; // TODO: use abstractions
               self.searchHeaderView.onSearch();
               self.mainResultsView.spinner.stop();
-              self.mainResultsView.removeDownlaodProgress();
+              //self.mainResultsView.removeDownlaodProgress();
               self.active = true;
             },
           });

diff --git a/static/js/views/searchresults.js b/static/js/views/searchresults.js
@@ -27,14 +27,19 @@ define([
           shadow : false    // Whether to render a shadow
         };
         this.spinner = new Spinner(opts).spin();
+        $(this.spinner.el).css('margin-top',  $(window).height()/4);
+        $(this.spinner.el).css('margin-left', $(window).width()/4);
+/*
         var halfHeight = opts.radius + opts.length + opts.width;
         $(this.spinner.el).css('margin-top',  $(window).height()/4 + halfHeight);
         $(this.spinner.el).css('margin-left', "50%");
         $(this.spinner.el).css("height", halfHeight + "px");
+*/
         $(this.el).append(this.spinner.el);
       }
     },
 
+/*
     setDownloadProgress: function(receivedB, totalB) {
       if (!this.options.spinner)
         return;
@@ -59,7 +64,7 @@ define([
         this.progressEl = undefined;
       }
     },
-
+*/
     render: function() {
       console.log('[Data loaded, rendering models.]');
       // render a subview for each model in the collection