Skip to content

B
bootstrap
Commit 5b4a29d8 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

honor data attributes set on modal as well

parent d7953a8f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
docs/assets/js/bootstrap-modal.js
View file @ 5b4a29d8
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
, data = $this.data('modal') , 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 (!data) $this.data('modal', (data = new Modal(this, options)))
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
else if (options.show) data.show() else if (options.show) data.show()
......
js/bootstrap-modal.js
View file @ 5b4a29d8
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
, data = $this.data('modal') , 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 (!data) $this.data('modal', (data = new Modal(this, options)))
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
else if (options.show) data.show() else if (options.show) data.show()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment