Skip to content

Commit

Permalink
Instantly display workflow form upgrade messages, avoid fade in
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Aug 1, 2016
1 parent c8de0ed commit 6bff8ce
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 12 deletions.
5 changes: 3 additions & 2 deletions client/galaxy/scripts/mvc/tool/tool-form-composite.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ define([ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view'
_refresh: function() {
var margin = _.reduce( this.$el.children(), function( memo, child ) {
return memo + $( child ).outerHeight();
}, 0 ) - this.$steps.height() + 30;
}, 0 ) - this.$steps.height() + 20;
this.$steps.css( 'height', $( window ).height() - margin );
},

Expand Down Expand Up @@ -195,7 +195,8 @@ define([ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view'
this.$message.append( new Ui.Message( {
message : 'Some tools in this workflow may have changed since it was last saved or some errors were found. The workflow may still run, but any new options will have default values. Please review the messages below to make a decision about whether the changes will affect your analysis.',
status : 'warning',
persistent : true
persistent : true,
fade : false
} ).$el );
}
},
Expand Down
5 changes: 3 additions & 2 deletions client/galaxy/scripts/mvc/ui/ui-misc.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ define(['utils/utils',
message : null,
status : 'info',
cls : '',
persistent : false
persistent : false,
fade : true
}).set( options );
this.listenTo( this.model, 'change', this.render, this );
this.render();
Expand All @@ -62,7 +63,7 @@ define(['utils/utils',
}
if ( this.model.get( 'message' ) ) {
this.$el.html( this.model.get( 'message' ) );
this.$el.fadeIn();
this.$el[ this.model.get( 'fade' ) ? 'fadeIn' : 'show' ]();
this.timeout && window.clearTimeout( this.timeout );
if ( !this.model.get( 'persistent' ) ) {
var self = this;
Expand Down
2 changes: 1 addition & 1 deletion static/maps/mvc/tool/tool-form-composite.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/maps/mvc/ui/ui-misc.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions static/scripts/bundled/analysis.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/analysis.bundled.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/libs.bundled.js.map

Large diffs are not rendered by default.

0 comments on commit 6bff8ce

Please sign in to comment.