Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip

Conflicts:
	js/tests/unit/bootstrap-collapse.js

js/tests/index.html

@@ -53,4 +53,4 @@
     <div id="qunit-fixture"></div>
   </div>
 </body>
-</html>
+</html>

js/tests/phantom.js

@@ -60,4 +60,4 @@ page.open(phantom.args[0], function(status){
       phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0)
     })
   }
-})
+})

js/tests/server.js

@@ -11,4 +11,4 @@ var connect = require('connect')
 
 http.createServer(app).listen(3000);
 
-fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8')
+fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8')

js/tests/unit/bootstrap-affix.js

@@ -22,4 +22,4 @@ $(function () {
         ok(!$affix.hasClass('affix'), 'affix class was not added')
       })
 
-})
+})

js/tests/unit/bootstrap-alert.js

@@ -59,4 +59,4 @@ $(function () {
           .alert('close')
       })
 
-})
+})

js/tests/unit/bootstrap-button.js

@@ -99,4 +99,4 @@ $(function () {
         ok(btn2.hasClass('active'), 'btn2 has active class')
       })
 
-})
+})

js/tests/unit/bootstrap-carousel.js

@@ -78,4 +78,4 @@ $(function () {
         ok($('#myCarousel').data('carousel').options.interval == 1814, "attributes should be read only on intitialization");
         $('#myCarousel').remove();
       })
-})
+})

js/tests/unit/bootstrap-dropdown.js

@@ -148,4 +148,4 @@ $(function () {
         $("#qunit-fixture").html("")
       })
 
-})
+})

js/tests/unit/bootstrap-modal.js

@@ -134,4 +134,4 @@ $(function () {
           })
           .modal("show")
       })
-})
+})

js/tests/unit/bootstrap-phantom.js

@@ -18,4 +18,4 @@ QUnit.done = function (opts) {
   console.log("\n================================================")
   console.log("Tests completed in " + opts.runtime + " milliseconds")
   console.log(opts.passed + " tests of " + opts.total + " passed, " + opts.failed + " failed.")
-}
+}

js/tests/unit/bootstrap-popover.js

@@ -110,4 +110,4 @@ $(function () {
         ok(!$._data(popover[0], 'events').mouseover && !$._data(popover[0], 'events').mouseout, 'popover does not have any events')
       })
 
-})
+})

js/tests/unit/bootstrap-scrollspy.js

@@ -34,4 +34,4 @@ $(function () {
         ok($topbar.find('.active', true))
       })
 
-})
+})

js/tests/unit/bootstrap-tab.js

@@ -83,4 +83,4 @@ $(function () {
           }).tab('show')
       })
 
-})
+})

js/tests/unit/bootstrap-transition.js

@@ -10,4 +10,4 @@ $(function () {
         ok($.support.transition ? $.support.transition.end : true, 'end string is defined')
       })
 
-})
+})

js/tests/vendor/qunit.css

@@ -229,4 +229,4 @@
 
 #qunit-fixture {
   display:none;
-}
+}

js/tests/vendor/qunit.js

@@ -1507,4 +1507,4 @@ QUnit.diff = (function() {
 	};
 })();
 
-})(this);
+})(this);