rake convert

Author: glebm

assets/javascripts/bootstrap-sprockets.js

@@ -4,9 +4,9 @@
 //= require ./bootstrap/carousel
 //= require ./bootstrap/collapse
 //= require ./bootstrap/dropdown
+//= require ./bootstrap/modal
+//= require ./bootstrap/scrollspy
 //= require ./bootstrap/tab
 //= require ./bootstrap/transition
-//= require ./bootstrap/scrollspy
-//= require ./bootstrap/modal
 //= require ./bootstrap/tooltip
 //= require ./bootstrap/popover

assets/javascripts/bootstrap.js

@@ -1924,7 +1924,7 @@ if (typeof jQuery === 'undefined') {
     for (i = offsets.length; i--;) {
       activeTarget != targets[i]
         && scrollTop >= offsets[i]
-        && (offsets[i + 1] === undefined || scrollTop <= offsets[i + 1])
+        && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
         && this.activate(targets[i])
     }
   }

assets/javascripts/bootstrap.min.js

@@ -96,7 +96,7 @@
     for (i = offsets.length; i--;) {
       activeTarget != targets[i]
         && scrollTop >= offsets[i]
-        && (offsets[i + 1] === undefined || scrollTop <= offsets[i + 1])
+        && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
         && this.activate(targets[i])
     }
   }

assets/javascripts/bootstrap/scrollspy.js

@@ -1,4 +1,4 @@
 module Bootstrap
   VERSION       = '3.3.3'
-  BOOTSTRAP_SHA = 'a3b6c9072c3d62316f21c0be405b81121d71cdf9'
+  BOOTSTRAP_SHA = '66ceae7b753137376ee00cd5a68004b7831c6eb9'
 end