aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/bootstrap-modal.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index 72b7e3525..76c495259 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -57,12 +57,10 @@
this.$element = $(content)
.delegate('.close', 'click.modal', $.proxy(this.hide, this))
- if ( options ) {
- $.extend( this.settings, options )
+ $.extend( this.settings, options )
- if ( this.settings.show ) {
- this.show()
- }
+ if ( this.settings.show ) {
+ this.show()
}
return this