Merge pull request #12982 from twbs/fat-9342

fix #9342
twbs · Mar 9, 2014 · 90eb524 · 90eb524
2 parents 4b6e1b6 + 74aab91
commit 90eb524
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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')

diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js
diff --git a/docs/assets/js/customize.min.js b/docs/assets/js/customize.min.js
diff --git a/docs/assets/js/raw-files.min.js b/docs/assets/js/raw-files.min.js
diff --git a/docs/dist/js/bootstrap.min.js b/docs/dist/js/bootstrap.min.js
diff --git 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')

diff --git a/test-infra/npm-shrinkwrap.canonical.json b/test-infra/npm-shrinkwrap.canonical.json