Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'js/bootstrap-modal.js')
-rw-r--r--js/bootstrap-modal.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index 76c4952599..2cc910989f 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -53,12 +53,10 @@
* ============================= */
var Modal = function ( content, options ) {
- this.settings = $.extend({}, $.fn.modal.defaults)
+ this.settings = $.extend({}, $.fn.modal.defaults, options)
this.$element = $(content)
.delegate('.close', 'click.modal', $.proxy(this.hide, this))
- $.extend( this.settings, options )
-
if ( this.settings.show ) {
this.show()
}