diff options
| author | Mark Otto <[email protected]> | 2012-02-12 13:27:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-12 13:27:29 -0800 |
| commit | de6f3d4a6f3c2c55394e59e0a25ea85731166cfe (patch) | |
| tree | e3e7dd6836f39a75ec99526a062510357c547a0b /docs/assets/js | |
| parent | ebe547b6a0c4ab8c546221db0731104c464920b3 (diff) | |
| parent | 5b4a29d84e6290a93db98da34b89776a9740e455 (diff) | |
| download | bootstrap-de6f3d4a6f3c2c55394e59e0a25ea85731166cfe.tar.xz bootstrap-de6f3d4a6f3c2c55394e59e0a25ea85731166cfe.zip | |
Merge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/assets/js')
| -rw-r--r-- | docs/assets/js/bootstrap-modal.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index 180f0b64d..ffbed0d2e 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() |