Skip to content
Browse files

rolling back progress bar change pending fix for multiple spinners

  • Loading branch information...
1 parent fe90484 commit 07a2d1521573d93359f493b5dea9e5fa9bcb7c86 @rgarcia committed Apr 13, 2012
Showing with 9 additions and 3 deletions.
  1. +0 −1 static/js/views/fullwindow.js
  2. +3 −1 static/js/views/languageview.js
  3. +6 −1 static/js/views/searchresults.js
View
1 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);
View
4 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;
},
});
View
7 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

0 comments on commit 07a2d15

Please sign in to comment.
Something went wrong with that request. Please try again.