diff options
| author | Jacob Thornton <[email protected]> | 2012-02-12 11:15:12 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-12 11:15:12 -0800 |
| commit | 5b4a29d84e6290a93db98da34b89776a9740e455 (patch) | |
| tree | fe450350a156e2fe9bdfae8d22afc9bbb0a05770 | |
| parent | d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f (diff) | |
| download | bootstrap-5b4a29d84e6290a93db98da34b89776a9740e455.tar.xz bootstrap-5b4a29d84e6290a93db98da34b89776a9740e455.zip | |
honor data attributes set on modal as well
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 52705 -> 52712 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-modal.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-modal.js | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 18f938cf9..073df93f0 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip 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() diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 180f0b64d..ffbed0d2e 100644 --- a/js/bootstrap-modal.js +++ b/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() |