1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2a2457d3bad0/ Changeset: 2a2457d3bad0 User: guerler Date: 2013-09-24 07:11:41 Summary: Show dataset title in scratchbook frame header Affected #: 2 files diff -r 6acc907464869c92c4bb366f6574c52714f60ae7 -r 2a2457d3bad09740d48cd2ba4de98936aafe2105 static/scripts/galaxy.upload.js --- a/static/scripts/galaxy.upload.js +++ b/static/scripts/galaxy.upload.js @@ -163,22 +163,7 @@ // success event_success : function(index, file, message) - { - // get element - var it = this.get_upload_item(index); - - // update progress frame - it.addClass('panel-success'); - it.removeClass('panel-default'); - - // update icon - var sy = it.find('.symbol'); - sy.addClass(this.state.done); - - // remove spin - sy.removeClass('fa-icon-spin'); - sy.removeClass('fa-icon-spinner'); - + { // update galaxy history Galaxy.currHistoryPanel.refresh(); @@ -194,32 +179,26 @@ // update on screen info this.update_screen(); + + // get element + var it = this.get_upload_item(index); + + // update progress frame + it.addClass('panel-success'); + it.removeClass('panel-default'); + + // update icon + var sy = it.find('.symbol'); + sy.removeClass('fa-icon-spin'); + sy.removeClass('fa-icon-spinner'); + + // set status + sy.addClass(this.state.done); }, // error event_error : function(index, file, message) { - // get element - var it = this.get_upload_item(index); - - // update progress frame - it.addClass('panel-danger'); - it.removeClass('panel-default'); - - // update icon - var sy = it.find('.symbol'); - sy.addClass(this.state.done); - - // remove spin - sy.removeClass('fa-icon-spin'); - sy.removeClass('fa-icon-spinner'); - - // remove progress bar - it.find('.progress').remove(); - - // write error message - it.find('.error').html('<strong>Failed:</strong> ' + message); - // make sure progress is shown correctly this.event_progress(index, file, 0); @@ -232,6 +211,27 @@ // update on screen info this.update_screen(); + + // get element + var it = this.get_upload_item(index); + + // update progress frame + it.addClass('panel-danger'); + it.removeClass('panel-default'); + + // remove progress bar + it.find('.progress').remove(); + + // write error message + it.find('.error').html('<strong>Failed:</strong> ' + message); + + // update icon + var sy = it.find('.symbol'); + sy.removeClass('fa-icon-spin'); + sy.removeClass('fa-icon-spinner'); + + // set status + sy.addClass(this.state.done); }, // start upload process @@ -241,13 +241,6 @@ if (this.counter.announce == 0 || this.counter.running > 0) return; - // update running - this.counter.running = this.counter.announce; - this.update_screen(); - - // hide configuration - $(this.el).find('.panel-body').hide(); - // switch icons for new uploads var self = this; $(this.el).find('.symbol').each(function() @@ -259,6 +252,13 @@ $(this).addClass('fa-icon-spin'); } }); + + // hide configuration + $(this.el).find('.panel-body').hide(); + + // update running + this.counter.running = this.counter.announce; + this.update_screen(); // configure url var current_history = Galaxy.currHistoryPanel.model.get('id'); diff -r 6acc907464869c92c4bb366f6574c52714f60ae7 -r 2a2457d3bad09740d48cd2ba4de98936aafe2105 static/scripts/mvc/dataset/hda-base.js --- a/static/scripts/mvc/dataset/hda-base.js +++ b/static/scripts/mvc/dataset/hda-base.js @@ -251,7 +251,7 @@ var self = this; displayBtnData.on_click = function(){ Galaxy.frame_manager.frame_new({ - title : "Data Viewer", + title : "Data Viewer: " + self.model.get('name'), type : "url", location: "center", content : self.urls.display 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.