diff options
| author | Jacob Thornton <[email protected]> | 2012-02-16 22:41:02 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-16 22:41:02 -0800 |
| commit | 03e6dc66c2fe14e756723395752feefb687b6526 (patch) | |
| tree | b8cfe13d72e1a780ef08dbd26e3bfe48e406c59e /docs/assets/js/bootstrap-modal.js | |
| parent | 9143d8e449a852c606194ea8c529e30ea1a52ddf (diff) | |
| parent | 091622644a0c619e1afbb21041c141da30df76b7 (diff) | |
| download | bootstrap-03e6dc66c2fe14e756723395752feefb687b6526.tar.xz bootstrap-03e6dc66c2fe14e756723395752feefb687b6526.zip | |
Merge branch '2.0.1-wip'
Diffstat (limited to 'docs/assets/js/bootstrap-modal.js')
| -rw-r--r-- | docs/assets/js/bootstrap-modal.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index 180f0b64d..0a69b6a2f 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -177,7 +177,7 @@ return this.each(function () { var $this = $(this) , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, typeof option == 'object' && option) + , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) if (!data) $this.data('modal', (data = new Modal(this, options))) if (typeof option == 'string') data[option]() else if (options.show) data.show() @@ -207,4 +207,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery );
\ No newline at end of file |