From 5b4a29d84e6290a93db98da34b89776a9740e455 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 12 Feb 2012 11:15:12 -0800 Subject: honor data attributes set on modal as well --- docs/assets/bootstrap.zip | Bin 52705 -> 52712 bytes docs/assets/js/bootstrap-modal.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 18f938cf9..073df93f0 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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() -- cgit v1.2.3