From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 12 Feb 2012 19:15:12 +0000 (-0800)
Subject: honor data attributes set on modal as well
X-Git-Tag: v2.0.1~1^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b4a29d84e6290a93db98da34b89776a9740e455;p=thirdparty%2Fbootstrap.git

honor data attributes set on modal as well
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 18f938cf9c..073df93f0a 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 180f0b64d9..ffbed0d2ef 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 180f0b64d9..ffbed0d2ef 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()