diff options
| author | Thomas Park <thomas@thomaspark.me> | 2012-03-13 18:41:44 -0400 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.me> | 2012-03-13 18:41:44 -0400 |
| commit | 43a4a1fd764fd15cc530e19a3643cf36d23079b6 (patch) | |
| tree | 21d9e6d62e85dab7f4fb1caa032a01bdd210db4e /assets/js/bootstrap-modal.js | |
| parent | 342cce47318fbde6612c156bb1483a111bfcfd4a (diff) | |
update for bootstrap 2.0.2
Diffstat (limited to 'assets/js/bootstrap-modal.js')
| -rwxr-xr-x | assets/js/bootstrap-modal.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/assets/js/bootstrap-modal.js b/assets/js/bootstrap-modal.js index 180f0b64..e9297062 100755 --- a/assets/js/bootstrap-modal.js +++ b/assets/js/bootstrap-modal.js @@ -1,5 +1,5 @@ /* ========================================================= - * bootstrap-modal.js v2.0.0 + * bootstrap-modal.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -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 |