7:53 p.m.
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/aa58945453ab/
Changeset: aa58945453ab
Branch: next-stable
User: dannon
Date: 2014-05-30 21:52:49
Summary: Fix loading indicator jqmigrate griping. Also improve it to where it's
not looking for a global ajaxstart/ajaxstop.
Affected #: 1 file
diff -r cb1e86b187a38fce1b9601115fc1a51809f3b292 -r
aa58945453ab7a5ced6852a731a9dabb531f27d6 static/scripts/mvc/data.js
--- a/static/scripts/mvc/data.js
+++ b/static/scripts/mvc/data.js
@@ -135,14 +135,8 @@
render: function() {
// Add loading indicator.
var loading_indicator = $('<div/>').attr('id',
'loading_indicator');
+ this.$el.append(loading_indicator);
- loading_indicator.ajaxStart(function(){
- $(this).show();
- }).ajaxStop(function(){
- $(this).hide();
- });
-
- this.$el.append(loading_indicator);
// Add data table and header.
var data_table = $('<table/>').attr({
id: 'content_table',
@@ -172,10 +166,12 @@
// If not already loading a chunk and have scrolled to the bottom of this
element, get next chunk.
if ( !loading_chunk && self.scrolled_to_bottom() ) {
loading_chunk = true;
+ loading_indicator.show();
$.when(self.model.get_next_chunk()).then(function(result) {
if (result) {
self._renderChunk(result);
loading_chunk = false;
+ loading_indicator.hide();
}
});
}
https://bitbucket.org/galaxy/galaxy-central/commits/67549a8abdaf/
Changeset: 67549a8abdaf
User: dannon
Date: 2014-05-30 21:53:13
Summary: Merge next-stable.
Affected #: 1 file
diff -r 25ab1fe9dbc7659fbf3cdfea26d5f03e4c521701 -r
67549a8abdafdf2455d5190f3582c8ccfdac7a48 static/scripts/mvc/data.js
--- a/static/scripts/mvc/data.js
+++ b/static/scripts/mvc/data.js
@@ -135,14 +135,8 @@
render: function() {
// Add loading indicator.
var loading_indicator = $('<div/>').attr('id',
'loading_indicator');
+ this.$el.append(loading_indicator);
- loading_indicator.ajaxStart(function(){
- $(this).show();
- }).ajaxStop(function(){
- $(this).hide();
- });
-
- this.$el.append(loading_indicator);
// Add data table and header.
var data_table = $('<table/>').attr({
id: 'content_table',
@@ -179,10 +173,12 @@
// If not already loading a chunk and have scrolled to the bottom of this
element, get next chunk.
if ( !loading_chunk && self.scrolled_to_bottom() ) {
loading_chunk = true;
+ loading_indicator.show();
$.when(self.model.get_next_chunk()).then(function(result) {
if (result) {
self._renderChunk(result);
loading_chunk = false;
+ loading_indicator.hide();
}
});
}
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.