Merge pull request #12982 from twbs/fat-9342

fix #9342

Merge pull request #12982 from twbs/fat-9342
fix #9342
90eb5249 · Mark Otto · 4b6e1b67 · 74aab916 · 90eb5249 · 90eb5249
Commit 90eb5249 authored 11 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 7 additions and 7 deletions
+7 -7
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -1880,7 +1880,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false

    if (this.affixed === affix) return
-    if (this.unpin) this.$element.css('top', '')
+    if (this.unpin != null) this.$element.css('top', '')

    var affixType = 'affix' + (affix ? '-' + affix : '')
    var e         = $.Event(affixType + '.bs.affix')

--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/docs/assets/js/customize.min.js
+++ b/docs/assets/js/customize.min.js
--- a/docs/assets/js/raw-files.min.js
+++ b/docs/assets/js/raw-files.min.js
--- a/docs/dist/js/bootstrap.min.js
+++ b/docs/dist/js/bootstrap.min.js
--- a/js/affix.js
+++ b/js/affix.js
@@ -66,7 +66,7 @@
                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false

    if (this.affixed === affix) return
-    if (this.unpin) this.$element.css('top', '')
+    if (this.unpin != null) this.$element.css('top', '')

    var affixType = 'affix' + (affix ? '-' + affix : '')
    var e         = $.Event(affixType + '.bs.affix')

--- a/test-infra/npm-shrinkwrap.canonical.json
+++ b/test-infra/npm-shrinkwrap.canonical.json