summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap/js
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2013-10-30 16:13:42 -0400
committerThomas Park <thomas@thomaspark.me>2013-10-30 16:13:42 -0400
commit48c64127b37be4a692a70cb7b38ed9744163582b (patch)
treedcf4b4b76612269a6b135c695861eca7e89a0cfa /bower_components/bootstrap/js
parent620e501c3d804b1dc2c7d796d7ae378db5e1a040 (diff)
3.0.0 -> 3.0.1
Diffstat (limited to 'bower_components/bootstrap/js')
-rwxr-xr-xbower_components/bootstrap/js/.jshintrc16
-rwxr-xr-xbower_components/bootstrap/js/affix.js4
-rwxr-xr-xbower_components/bootstrap/js/alert.js2
-rwxr-xr-xbower_components/bootstrap/js/button.js2
-rwxr-xr-xbower_components/bootstrap/js/carousel.js4
-rwxr-xr-xbower_components/bootstrap/js/collapse.js4
-rwxr-xr-xbower_components/bootstrap/js/dropdown.js4
-rwxr-xr-xbower_components/bootstrap/js/modal.js4
-rwxr-xr-xbower_components/bootstrap/js/popover.js4
-rwxr-xr-xbower_components/bootstrap/js/scrollspy.js4
-rwxr-xr-xbower_components/bootstrap/js/tab.js6
-rwxr-xr-xbower_components/bootstrap/js/tests/index.html2
-rwxr-xr-xbower_components/bootstrap/js/tests/phantom.js63
-rwxr-xr-xbower_components/bootstrap/js/tests/server.js14
-rwxr-xr-xbower_components/bootstrap/js/tests/unit/button.js10
-rwxr-xr-xbower_components/bootstrap/js/tests/unit/popover.js12
-rwxr-xr-xbower_components/bootstrap/js/tests/unit/tab.js12
-rwxr-xr-xbower_components/bootstrap/js/tests/unit/tooltip.js2
-rwxr-xr-xbower_components/bootstrap/js/tooltip.js4
-rwxr-xr-xbower_components/bootstrap/js/transition.js2
20 files changed, 49 insertions, 126 deletions
diff --git a/bower_components/bootstrap/js/.jshintrc b/bower_components/bootstrap/js/.jshintrc
index 94c520d5..fdfdfbbf 100755
--- a/bower_components/bootstrap/js/.jshintrc
+++ b/bower_components/bootstrap/js/.jshintrc
@@ -1,14 +1,14 @@
{
- "validthis": true,
- "laxcomma" : true,
- "laxbreak" : true,
+ "asi" : true,
+ "boss" : true,
"browser" : true,
- "eqeqeq" : false,
- "eqnull" : true,
+ "curly" : false,
"debug" : true,
"devel" : true,
- "curly" : false,
- "boss" : true,
+ "eqeqeq" : false,
+ "eqnull" : true,
"expr" : true,
- "asi" : true
+ "laxbreak" : true,
+ "laxcomma" : true,
+ "validthis": true
} \ No newline at end of file
diff --git a/bower_components/bootstrap/js/affix.js b/bower_components/bootstrap/js/affix.js
index c7be96e1..a75a46db 100755
--- a/bower_components/bootstrap/js/affix.js
+++ b/bower_components/bootstrap/js/affix.js
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: affix.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#affix
+ * http://getbootstrap.com/javascript/#affix
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/bower_components/bootstrap/js/alert.js b/bower_components/bootstrap/js/alert.js
index 663029ed..73372e4f 100755
--- a/bower_components/bootstrap/js/alert.js
+++ b/bower_components/bootstrap/js/alert.js
@@ -1,6 +1,6 @@
/* ========================================================================
* Bootstrap: alert.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#alerts
+ * http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2013 Twitter, Inc.
*
diff --git a/bower_components/bootstrap/js/button.js b/bower_components/bootstrap/js/button.js
index fc73b555..44c101a2 100755
--- a/bower_components/bootstrap/js/button.js
+++ b/bower_components/bootstrap/js/button.js
@@ -1,6 +1,6 @@
/* ========================================================================
* Bootstrap: button.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#buttons
+ * http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2013 Twitter, Inc.
*
diff --git a/bower_components/bootstrap/js/carousel.js b/bower_components/bootstrap/js/carousel.js
index d8c4c243..cf7baf2a 100755
--- a/bower_components/bootstrap/js/carousel.js
+++ b/bower_components/bootstrap/js/carousel.js
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: carousel.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#carousel
+ * http://getbootstrap.com/javascript/#carousel
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/bower_components/bootstrap/js/collapse.js b/bower_components/bootstrap/js/collapse.js
index 92cc0bc7..beb04772 100755
--- a/bower_components/bootstrap/js/collapse.js
+++ b/bower_components/bootstrap/js/collapse.js
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: collapse.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#collapse
+ * http://getbootstrap.com/javascript/#collapse
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/bower_components/bootstrap/js/dropdown.js b/bower_components/bootstrap/js/dropdown.js
index 6093f11a..e45d51c2 100755
--- a/bower_components/bootstrap/js/dropdown.js
+++ b/bower_components/bootstrap/js/dropdown.js
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: dropdown.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#dropdowns
+ * http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/bower_components/bootstrap/js/modal.js b/bower_components/bootstrap/js/modal.js
index 65eba481..b5b56016 100755
--- a/bower_components/bootstrap/js/modal.js
+++ b/bower_components/bootstrap/js/modal.js
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: modal.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#modals
+ * http://getbootstrap.com/javascript/#modals
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/bower_components/bootstrap/js/popover.js b/bower_components/bootstrap/js/popover.js
index ecd37ac2..d5cd02e5 100755
--- a/bower_components/bootstrap/js/popover.js
+++ b/bower_components/bootstrap/js/popover.js
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: popover.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#popovers
+ * http://getbootstrap.com/javascript/#popovers
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/bower_components/bootstrap/js/scrollspy.js b/bower_components/bootstrap/js/scrollspy.js
index 10f95f24..c88eaad9 100755
--- a/bower_components/bootstrap/js/scrollspy.js
+++ b/bower_components/bootstrap/js/scrollspy.js
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: scrollspy.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#scrollspy
+ * http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/bower_components/bootstrap/js/tab.js b/bower_components/bootstrap/js/tab.js
index e1c15592..7aff6130 100755
--- a/bower_components/bootstrap/js/tab.js
+++ b/bower_components/bootstrap/js/tab.js
@@ -1,8 +1,8 @@
/* ========================================================================
* Bootstrap: tab.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tabs
+ * http://getbootstrap.com/javascript/#tabs
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
Tab.prototype.show = function () {
var $this = this.element
var $ul = $this.closest('ul:not(.dropdown-menu)')
- var selector = $this.attr('data-target')
+ var selector = $this.data('target')
if (!selector) {
selector = $this.attr('href')
diff --git a/bower_components/bootstrap/js/tests/index.html b/bower_components/bootstrap/js/tests/index.html
index 501bf38f..4e3d487d 100755
--- a/bower_components/bootstrap/js/tests/index.html
+++ b/bower_components/bootstrap/js/tests/index.html
@@ -8,7 +8,7 @@
<script src="vendor/jquery.js"></script>
<!-- qunit -->
- <link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen" />
+ <link rel="stylesheet" href="vendor/qunit.css" media="screen">
<script src="vendor/qunit.js"></script>
<!-- plugin sources -->
diff --git a/bower_components/bootstrap/js/tests/phantom.js b/bower_components/bootstrap/js/tests/phantom.js
deleted file mode 100755
index a9047db4..00000000
--- a/bower_components/bootstrap/js/tests/phantom.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Simple phantom.js integration script
-// Adapted from Modernizr
-
-function waitFor(testFx, onReady, timeOutMillis) {
- var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 5001 //< Default Max Timout is 5s
- , start = new Date().getTime()
- , condition = false
- , interval = setInterval(function () {
- if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) {
- // If not time-out yet and condition not yet fulfilled
- condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code
- } else {
- if (!condition) {
- // If condition still not fulfilled (timeout but condition is 'false')
- console.log("'waitFor()' timeout")
- phantom.exit(1)
- } else {
- // Condition fulfilled (timeout and/or condition is 'true')
- typeof(onReady) === "string" ? eval(onReady) : onReady() //< Do what it's supposed to do once the condition is fulfilled
- clearInterval(interval) //< Stop this interval
- }
- }
- }, 100) //< repeat check every 100ms
-}
-
-
-if (phantom.args.length === 0 || phantom.args.length > 2) {
- console.log('Usage: phantom.js URL')
- phantom.exit()
-}
-
-var page = new WebPage()
-
-// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
-page.onConsoleMessage = function(msg) {
- console.log(msg)
-};
-
-page.open(phantom.args[0], function(status){
- if (status !== "success") {
- console.log("Unable to access network")
- phantom.exit()
- } else {
- waitFor(function(){
- return page.evaluate(function(){
- var el = document.getElementById('qunit-testresult')
- if (el && el.innerText.match('completed')) {
- return true
- }
- return false
- })
- }, function(){
- var failedNum = page.evaluate(function(){
- var el = document.getElementById('qunit-testresult')
- try {
- return el.getElementsByClassName('failed')[0].innerHTML
- } catch (e) { }
- return 10000
- });
- phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0)
- })
- }
-})
diff --git a/bower_components/bootstrap/js/tests/server.js b/bower_components/bootstrap/js/tests/server.js
deleted file mode 100755
index f0def8f3..00000000
--- a/bower_components/bootstrap/js/tests/server.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Simple connect server for phantom.js
- * Adapted from Modernizr
- */
-
-var connect = require('connect')
- , http = require('http')
- , fs = require('fs')
- , app = connect()
- .use(connect.static(__dirname + '/../../'));
-
-http.createServer(app).listen(3000);
-
-fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8')
diff --git a/bower_components/bootstrap/js/tests/unit/button.js b/bower_components/bootstrap/js/tests/unit/button.js
index 41ddb5c2..16284e0c 100755
--- a/bower_components/bootstrap/js/tests/unit/button.js
+++ b/bower_components/bootstrap/js/tests/unit/button.js
@@ -18,9 +18,9 @@ $(function () {
test("should return set state to loading", function () {
var btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
- equals(btn.html(), 'mdo', 'btn text equals mdo')
+ equal(btn.html(), 'mdo', 'btn text equals mdo')
btn.button('loading')
- equals(btn.html(), 'fat', 'btn text equals fat')
+ equal(btn.html(), 'fat', 'btn text equals fat')
stop()
setTimeout(function () {
ok(btn.attr('disabled'), 'btn is disabled')
@@ -31,9 +31,9 @@ $(function () {
test("should return reset state", function () {
var btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
- equals(btn.html(), 'mdo', 'btn text equals mdo')
+ equal(btn.html(), 'mdo', 'btn text equals mdo')
btn.button('loading')
- equals(btn.html(), 'fat', 'btn text equals fat')
+ equal(btn.html(), 'fat', 'btn text equals fat')
stop()
setTimeout(function () {
ok(btn.attr('disabled'), 'btn is disabled')
@@ -41,7 +41,7 @@ $(function () {
start()
stop()
btn.button('reset')
- equals(btn.html(), 'mdo', 'btn text equals mdo')
+ equal(btn.html(), 'mdo', 'btn text equals mdo')
setTimeout(function () {
ok(!btn.attr('disabled'), 'btn is not disabled')
ok(!btn.hasClass('disabled'), 'btn does not have disabled class')
diff --git a/bower_components/bootstrap/js/tests/unit/popover.js b/bower_components/bootstrap/js/tests/unit/popover.js
index 767d7986..c9f7d63a 100755
--- a/bower_components/bootstrap/js/tests/unit/popover.js
+++ b/bower_components/bootstrap/js/tests/unit/popover.js
@@ -53,8 +53,8 @@ $(function () {
popover.popover('show')
ok($('.popover').length, 'popover was inserted')
- equals($('.popover .popover-title').text(), '@fat', 'title correctly inserted')
- equals($('.popover .popover-content').text(), 'loves writing tests (╯°□°)╯︵ ┻━┻', 'content correctly inserted')
+ equal($('.popover .popover-title').text(), '@fat', 'title correctly inserted')
+ equal($('.popover .popover-content').text(), 'loves writing tests (╯°□°)╯︵ ┻━┻', 'content correctly inserted')
popover.popover('hide')
ok(!$('.popover').length, 'popover was removed')
@@ -69,8 +69,8 @@ $(function () {
.popover('show')
ok($('.popover').length, 'popover was inserted')
- equals($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
- equals($('.popover .popover-content').text(), "loves data attributes (づ。◕‿‿◕。)づ ︵ ┻━┻", 'content correctly inserted')
+ equal($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
+ equal($('.popover .popover-content').text(), "loves data attributes (づ。◕‿‿◕。)づ ︵ ┻━┻", 'content correctly inserted')
popover.popover('hide')
ok(!$('.popover').length, 'popover was removed')
@@ -89,8 +89,8 @@ $(function () {
.popover('show')
ok($('.popover').length, 'popover was inserted')
- equals($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
- equals($('.popover .popover-content').text(), "loves data attributes (づ。◕‿‿◕。)づ ︵ ┻━┻", 'content correctly inserted')
+ equal($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
+ equal($('.popover .popover-content').text(), "loves data attributes (づ。◕‿‿◕。)づ ︵ ┻━┻", 'content correctly inserted')
popover.popover('hide')
ok(!$('.popover').length, 'popover was removed')
diff --git a/bower_components/bootstrap/js/tests/unit/tab.js b/bower_components/bootstrap/js/tests/unit/tab.js
index aede32ab..0db7cdb5 100755
--- a/bower_components/bootstrap/js/tests/unit/tab.js
+++ b/bower_components/bootstrap/js/tests/unit/tab.js
@@ -26,10 +26,10 @@ $(function () {
$('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture")
$(tabsHTML).find('li:last a').tab('show')
- equals($("#qunit-fixture").find('.active').attr('id'), "profile")
+ equal($("#qunit-fixture").find('.active').attr('id'), "profile")
$(tabsHTML).find('li:first a').tab('show')
- equals($("#qunit-fixture").find('.active').attr('id'), "home")
+ equal($("#qunit-fixture").find('.active').attr('id'), "home")
})
test("should activate element by tab id", function () {
@@ -42,10 +42,10 @@ $(function () {
$('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture")
$(pillsHTML).find('li:last a').tab('show')
- equals($("#qunit-fixture").find('.active').attr('id'), "profile")
+ equal($("#qunit-fixture").find('.active').attr('id'), "profile")
$(pillsHTML).find('li:first a').tab('show')
- equals($("#qunit-fixture").find('.active').attr('id'), "home")
+ equal($("#qunit-fixture").find('.active').attr('id'), "home")
})
@@ -77,9 +77,9 @@ $(function () {
$(dropHTML).find('ul>li:first a').tab('show').end()
.find('ul>li:last a').on('show', function(event){
- equals(event.relatedTarget.hash, "#1-1")
+ equal(event.relatedTarget.hash, "#1-1")
}).on('shown', function(event){
- equals(event.relatedTarget.hash, "#1-1")
+ equal(event.relatedTarget.hash, "#1-1")
}).tab('show')
})
diff --git a/bower_components/bootstrap/js/tests/unit/tooltip.js b/bower_components/bootstrap/js/tests/unit/tooltip.js
index ed1bf54b..dc3ddd37 100755
--- a/bower_components/bootstrap/js/tests/unit/tooltip.js
+++ b/bower_components/bootstrap/js/tests/unit/tooltip.js
@@ -29,7 +29,7 @@ $(function () {
test("should add data attribute for referencing original title", function () {
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').tooltip()
- equals(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
+ equal(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
})
test("should place tooltips relative to placement option", function () {
diff --git a/bower_components/bootstrap/js/tooltip.js b/bower_components/bootstrap/js/tooltip.js
index 89802287..41375c6c 100755
--- a/bower_components/bootstrap/js/tooltip.js
+++ b/bower_components/bootstrap/js/tooltip.js
@@ -1,9 +1,9 @@
/* ========================================================================
* Bootstrap: tooltip.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tooltip
+ * http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/bower_components/bootstrap/js/transition.js b/bower_components/bootstrap/js/transition.js
index e8f318be..d3a7abff 100755
--- a/bower_components/bootstrap/js/transition.js
+++ b/bower_components/bootstrap/js/transition.js
@@ -1,6 +1,6 @@
/* ========================================================================
* Bootstrap: transition.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#transitions
+ * http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2013 Twitter, Inc.
*