diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-03 06:25:16 +0400 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-03 06:25:16 +0400 |
| commit | af61bf673953cf9c88da72bba6dd81aa44814e8c (patch) | |
| tree | 70fea76839c19ad4622034abbe42288fec1c3c29 /assets/javascripts | |
| parent | ee64428a406674ee20365cabb79b95536d3687f1 (diff) | |
rake convert
Diffstat (limited to 'assets/javascripts')
| -rw-r--r-- | assets/javascripts/bootstrap.js | 2 | ||||
| -rw-r--r-- | assets/javascripts/bootstrap/collapse.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/assets/javascripts/bootstrap.js b/assets/javascripts/bootstrap.js index 87c63d7..637ff16 100644 --- a/assets/javascripts/bootstrap.js +++ b/assets/javascripts/bootstrap.js @@ -730,7 +730,7 @@ var data = $this.data('bs.collapse') var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) - if (!data && options.toggle && option == 'show') option = !option + if (!data && options.toggle && option == 'show') options.toggle = false if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) diff --git a/assets/javascripts/bootstrap/collapse.js b/assets/javascripts/bootstrap/collapse.js index a265344..db89804 100644 --- a/assets/javascripts/bootstrap/collapse.js +++ b/assets/javascripts/bootstrap/collapse.js @@ -124,7 +124,7 @@ var data = $this.data('bs.collapse') var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) - if (!data && options.toggle && option == 'show') option = !option + if (!data && options.toggle && option == 'show') options.toggle = false if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) |