aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-10-02 22:26:26 -0700
committerJacob Thornton <[email protected]>2011-10-02 22:26:26 -0700
commitf8be7a805264fe35edf233303d5954a74f32f637 (patch)
tree32e329ea393c39f0f3290a8334a69309c8aef958
parentb2b8a789718d8a2cc3248509a94eee36ead6f504 (diff)
downloadbootstrap-f8be7a805264fe35edf233303d5954a74f32f637.tar.xz
bootstrap-f8be7a805264fe35edf233303d5954a74f32f637.zip
remove options check in modal.js
-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