honor data attributes set on modal as well

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 18f938cf9c3b687c4f77406cacda431095ca7775..073df93f0a1178b1447d9048ffb2b4baeea4d745 100644 (file)
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 180f0b64d9a8e948614a602443827fbf8533f9dc..ffbed0d2ef93e989044e5b35a24da3a3a92c2b0b 100644 (file)
--- 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 180f0b64d9a8e948614a602443827fbf8533f9dc..ffbed0d2ef93e989044e5b35a24da3a3a92c2b0b 100644 (file)
--- 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()