]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
remove options check in modal.js
authorJacob Thornton <jacobthornton@gmail.com>
Mon, 3 Oct 2011 05:26:26 +0000 (22:26 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Mon, 3 Oct 2011 05:26:26 +0000 (22:26 -0700)
js/bootstrap-modal.js

index 72b7e35256972dcab1bbd0152e9ed0cdadd85c62..76c4952599fb0b6457de30718cea5efe466509bb 100644 (file)
     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