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

Makefile

@@ -27,7 +27,7 @@ build:
 	@cp js/tests/vendor/jquery.js assets/js/
 	@echo "            ${CHECK}"
 	@printf "Compiling and minifying JavaScript..."
-	@cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > dist/js/bootstrap.js
+	@echo "if (!jQuery) throw new Error(\"Bootstrap requires jQuery\")\n" | cat - js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > dist/js/bootstrap.js
 	@uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.tmp.js
 	@echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > dist/js/copyright.js
 	@cat dist/js/copyright.js dist/js/bootstrap.min.tmp.js > dist/js/bootstrap.min.js

dist/js/bootstrap.js

+if (!jQuery) throw new Error("Bootstrap requires jQuery")
+
 /* ========================================================================
  * Bootstrap: transition.js v3.0.0
  * http://twbs.github.com/bootstrap/javascript.html#transitions
@@ -547,7 +549,7 @@
 
     var dimension = this.dimension()
     this.reset(this.$element[dimension]())
-    this.transition('removeClass', 'shown.bs.hidden')
+    this.transition('removeClass', 'hidden.bs.collapse')
     this.$element[dimension](0)
   }
 
@@ -1573,7 +1575,7 @@
 
         return ($href
           && $href.length
-          && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
+          && [[ $href.offset().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
       })
       .sort(function (a, b) { return a[0] - b[0] })
       .each(function () {

js/collapse.js

@@ -74,7 +74,7 @@
 
     var dimension = this.dimension()
     this.reset(this.$element[dimension]())
-    this.transition('removeClass', 'shown.bs.hidden')
+    this.transition('removeClass', 'hidden.bs.collapse')
     this.$element[dimension](0)
   }
 

js/scrollspy.js

@@ -60,7 +60,7 @@
 
         return ($href
           && $href.length
-          && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
+          && [[ $href.offset().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
       })
       .sort(function (a, b) { return a[0] - b[0] })
       .each(function () {