Skip to content

Commit

Permalink
Reversion of ui-misc messagebox changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
dannon committed Jan 12, 2017
1 parent 45a9d58 commit 8901073
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 34 deletions.
46 changes: 18 additions & 28 deletions client/galaxy/scripts/mvc/ui/ui-misc.js
Expand Up @@ -62,7 +62,7 @@ define(['utils/utils',
this.$el.addClass( 'alert' ).addClass( 'alert-' + status );
}
if ( this.model.get( 'message' ) ) {
this.$el.html( this.message_for_display() );
this.$el.html( this.model.get( 'message' ) );
this.$el[ this.model.get( 'fade' ) ? 'fadeIn' : 'show' ]();
this.timeout && window.clearTimeout( this.timeout );
if ( !this.model.get( 'persistent' ) ) {
Expand All @@ -75,15 +75,6 @@ define(['utils/utils',
this.$el.fadeOut();
}
return this;
},
message_for_display: function() {
return _.escape( this.model.get( 'message' ) );
}
});

var UnescapedMessage = Message.extend({
message_for_display: function() {
return this.model.get( 'message' );
}
});

Expand Down Expand Up @@ -157,22 +148,21 @@ define(['utils/utils',
});

return {
Button : Buttons.ButtonDefault,
ButtonIcon : Buttons.ButtonIcon,
ButtonCheck : Buttons.ButtonCheck,
ButtonMenu : Buttons.ButtonMenu,
ButtonLink : Buttons.ButtonLink,
Input : Input,
Label : Label,
Message : Message,
UnescapedMessage : UnescapedMessage,
Modal : Modal,
RadioButton : Options.RadioButton,
Checkbox : Options.Checkbox,
Radio : Options.Radio,
Select : Select,
Hidden : Hidden,
Slider : Slider,
Drilldown : Drilldown
Button : Buttons.ButtonDefault,
ButtonIcon : Buttons.ButtonIcon,
ButtonCheck : Buttons.ButtonCheck,
ButtonMenu : Buttons.ButtonMenu,
ButtonLink : Buttons.ButtonLink,
Input : Input,
Label : Label,
Message : Message,
Modal : Modal,
RadioButton : Options.RadioButton,
Checkbox : Options.Checkbox,
Radio : Options.Radio,
Select : Select,
Hidden : Hidden,
Slider : Slider,
Drilldown : Drilldown
}
});
});
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.

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

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

0 comments on commit 8901073

Please sign in to comment.