Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

2 files changed, 6 insertions, 39 deletions

diff --git a/docs/assets/js/application-scrollspy.js b/docs/assets/js/application-scrollspy.js
deleted file mode 100644
index 1f0b7cebe..000000000
--- a/docs/assets/js/application-scrollspy.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// scroll spy logic
-// ================
-$(function () {
-
-  var activeTarget,
-     position = {},
-     $window = $(window),
-     nav = $('body > .topbar li a'),
-     targets = nav.map(function () {
-       return $(this).attr('href');
-     }),
-     offsets = $.map(targets, function (id) {
-       return $(id).offset().top;
-     });
-
-  function setButton(id) {
-   nav.parent("li").removeClass('active');
-   $(nav[$.inArray(id, targets)]).parent("li").addClass('active');
-  }
-
-  function processScroll(e) {
-   var scrollTop = $window.scrollTop() + 10, i;
-   for (i = offsets.length; i--;) {
-     if (activeTarget != targets[i] && scrollTop >= offsets[i] && (!offsets[i + 1] || scrollTop <= offsets[i + 1])) {
-       activeTarget = targets[i];
-       setButton(activeTarget);
-     }
-   }
-  }
-
-  nav.click(function () {
-   processScroll();
-  });
-
-  processScroll();
-
-  $window.scroll(processScroll);
-
-})
\ No newline at end of file
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 86eefa89d..d1c6751ea 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -6,6 +6,12 @@ $(document).ready(function(){
   $('body').dropdown() // catch any dropdowns on the page
 
 
+  // Scrollspy
+  // =========
+
+  $('body > .topbar').scrollSpy()
+
+
   // table sort example
   // ==================