Skip to content

B
bootstrap
Commit f8be7a80 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

remove options check in modal.js

parent b2b8a789
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
js/bootstrap-modal.js
View file @ f8be7a80
...@@ -57,12 +57,10 @@ ...@@ -57,12 +57,10 @@
this.$element = $(content) this.$element = $(content)
.delegate('.close', 'click.modal', $.proxy(this.hide, this)) .delegate('.close', 'click.modal', $.proxy(this.hide, this))
if ( options ) { $.extend( this.settings, options )
$.extend( this.settings, options )
if ( this.settings.show ) { if ( this.settings.show ) {
this.show() this.show()
}
} }
return this return this
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment