diff --git a/client/galaxy/scripts/utils/deferred.js b/client/galaxy/scripts/utils/deferred.js index de244864402..bcddafb8460 100644 --- a/client/galaxy/scripts/utils/deferred.js +++ b/client/galaxy/scripts/utils/deferred.js @@ -40,7 +40,7 @@ return Backbone.Model.extend({ var id = Utils.uid(); this.process[id] = true; this.counter++; - console.debug('Deferred:register() - Registering ' + id); + console.debug('Deferred:register() - Register ' + id); return id; }, @@ -50,7 +50,7 @@ return Backbone.Model.extend({ if (this.process[id]) { delete this.process[id]; this.counter--; - console.debug('Deferred:done() - Unregistering ' + id); + console.debug('Deferred:done() - Unregister ' + id); this.trigger('refresh'); } }, diff --git a/static/scripts/packed/utils/deferred.js b/static/scripts/packed/utils/deferred.js index 72a7c131055..12b8af6c18c 100644 --- a/static/scripts/packed/utils/deferred.js +++ b/static/scripts/packed/utils/deferred.js @@ -1 +1 @@ -define(["utils/utils"],function(a){return Backbone.Model.extend({queue:[],process:{},counter:0,initialize:function(){this.on("refresh",function(){if(this.queue.length>0&&this.ready()){var b=this.queue[0];this.queue.splice(0,1);b&&b()}})},execute:function(b){this.queue.push(b);this.trigger("refresh")},register:function(){var b=a.uid();this.process[b]=true;this.counter++;console.debug("Deferred:register() - Registering "+b);return b},done:function(b){if(this.process[b]){delete this.process[b];this.counter--;console.debug("Deferred:done() - Unregistering "+b);this.trigger("refresh")}},reset:function(){this.queue=[]},ready:function(){return(this.counter==0)}})}); \ No newline at end of file +define(["utils/utils"],function(a){return Backbone.Model.extend({queue:[],process:{},counter:0,initialize:function(){this.on("refresh",function(){if(this.queue.length>0&&this.ready()){var b=this.queue[0];this.queue.splice(0,1);b&&b()}})},execute:function(b){this.queue.push(b);this.trigger("refresh")},register:function(){var b=a.uid();this.process[b]=true;this.counter++;console.debug("Deferred:register() - Register "+b);return b},done:function(b){if(this.process[b]){delete this.process[b];this.counter--;console.debug("Deferred:done() - Unregister "+b);this.trigger("refresh")}},reset:function(){this.queue=[]},ready:function(){return(this.counter==0)}})}); \ No newline at end of file diff --git a/static/scripts/utils/deferred.js b/static/scripts/utils/deferred.js index de244864402..bcddafb8460 100644 --- a/static/scripts/utils/deferred.js +++ b/static/scripts/utils/deferred.js @@ -40,7 +40,7 @@ return Backbone.Model.extend({ var id = Utils.uid(); this.process[id] = true; this.counter++; - console.debug('Deferred:register() - Registering ' + id); + console.debug('Deferred:register() - Register ' + id); return id; }, @@ -50,7 +50,7 @@ return Backbone.Model.extend({ if (this.process[id]) { delete this.process[id]; this.counter--; - console.debug('Deferred:done() - Unregistering ' + id); + console.debug('Deferred:done() - Unregister ' + id); this.trigger('refresh'); } },