From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 3 Oct 2011 05:26:26 +0000 (-0700)
Subject: remove options check in modal.js
X-Git-Tag: v1.4.0~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8be7a805264fe35edf233303d5954a74f32f637;p=thirdparty%2Fbootstrap.git

remove options check in modal.js
---

diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index 72b7e35256..76c4952599 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