diff options
| author | Gleb Mazovetskiy <glebm@google.com> | 2015-03-10 23:18:34 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glebm@google.com> | 2015-03-16 18:38:18 +0300 |
| commit | e6f8936f4d8b6b9550c50dab46ab95a75c78356e (patch) | |
| tree | 328cc2c0f783706b5bc2881476bf21fd0b25d4dd /assets/javascripts/bootstrap | |
| parent | e0ddfcdf288c23bd97b8511a290db7291ccf1860 (diff) | |
rake convert
Diffstat (limited to 'assets/javascripts/bootstrap')
| -rw-r--r-- | assets/javascripts/bootstrap/affix.js | 2 | ||||
| -rw-r--r-- | assets/javascripts/bootstrap/collapse.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/assets/javascripts/bootstrap/affix.js b/assets/javascripts/bootstrap/affix.js index 59584ec..fe780e4 100644 --- a/assets/javascripts/bootstrap/affix.js +++ b/assets/javascripts/bootstrap/affix.js @@ -78,7 +78,7 @@ var offset = this.options.offset var offsetTop = offset.top var offsetBottom = offset.bottom - var scrollHeight = $('body').height() + var scrollHeight = $(document.body).height() if (typeof offset != 'object') offsetBottom = offsetTop = offset if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) diff --git a/assets/javascripts/bootstrap/collapse.js b/assets/javascripts/bootstrap/collapse.js index 834f4f6..0394165 100644 --- a/assets/javascripts/bootstrap/collapse.js +++ b/assets/javascripts/bootstrap/collapse.js @@ -172,7 +172,7 @@ var data = $this.data('bs.collapse') var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) - if (!data && options.toggle && option == 'show') options.toggle = false + if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) |