Skip to content

Commit 444409b

Browse files
committed
Straight-up copy of the Bootstrap 2.1.1 javascript files
1 parent f201b26 commit 444409b

13 files changed

+16
-16
lines changed

vendor/assets/javascripts/bootstrap-affix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-affix.js v2.1.0
2+
* bootstrap-affix.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#affix
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

vendor/assets/javascripts/bootstrap-alert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-alert.js v2.1.0
2+
* bootstrap-alert.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#alerts
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

vendor/assets/javascripts/bootstrap-button.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ============================================================
2-
* bootstrap-button.js v2.1.0
2+
* bootstrap-button.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#buttons
44
* ============================================================
55
* Copyright 2012 Twitter, Inc.
@@ -51,7 +51,7 @@
5151
}
5252

5353
Button.prototype.toggle = function () {
54-
var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
54+
var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
5555

5656
$parent && $parent
5757
.find('.active')

vendor/assets/javascripts/bootstrap-carousel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-carousel.js v2.1.0
2+
* bootstrap-carousel.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#carousel
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

vendor/assets/javascripts/bootstrap-collapse.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-collapse.js v2.1.0
2+
* bootstrap-collapse.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#collapse
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.

vendor/assets/javascripts/bootstrap-dropdown.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ============================================================
2-
* bootstrap-dropdown.js v2.1.0
2+
* bootstrap-dropdown.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
44
* ============================================================
55
* Copyright 2012 Twitter, Inc.
@@ -110,7 +110,7 @@
110110

111111
if (!selector) {
112112
selector = $this.attr('href')
113-
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
113+
selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
114114
}
115115

116116
$parent = $(selector)

vendor/assets/javascripts/bootstrap-modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =========================================================
2-
* bootstrap-modal.js v2.1.0
2+
* bootstrap-modal.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#modals
44
* =========================================================
55
* Copyright 2012 Twitter, Inc.

vendor/assets/javascripts/bootstrap-popover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===========================================================
2-
* bootstrap-popover.js v2.1.0
2+
* bootstrap-popover.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#popovers
44
* ===========================================================
55
* Copyright 2012 Twitter, Inc.

vendor/assets/javascripts/bootstrap-scrollspy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-scrollspy.js v2.1.0
2+
* bootstrap-scrollspy.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.

vendor/assets/javascripts/bootstrap-tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================
2-
* bootstrap-tab.js v2.1.0
2+
* bootstrap-tab.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#tabs
44
* ========================================================
55
* Copyright 2012 Twitter, Inc.

vendor/assets/javascripts/bootstrap-tooltip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===========================================================
2-
* bootstrap-tooltip.js v2.1.0
2+
* bootstrap-tooltip.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#tooltips
44
* Inspired by the original jQuery.tipsy by Jason Frame
55
* ===========================================================

vendor/assets/javascripts/bootstrap-transition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===================================================
2-
* bootstrap-transition.js v2.1.0
2+
* bootstrap-transition.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#transitions
44
* ===================================================
55
* Copyright 2012 Twitter, Inc.

vendor/assets/javascripts/bootstrap-typeahead.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-typeahead.js v2.1.0
2+
* bootstrap-typeahead.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#typeahead
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.
@@ -174,7 +174,7 @@
174174
.on('keypress', $.proxy(this.keypress, this))
175175
.on('keyup', $.proxy(this.keyup, this))
176176

177-
if ($.browser.webkit || $.browser.msie) {
177+
if ($.browser.chrome || $.browser.webkit || $.browser.msie) {
178178
this.$element.on('keydown', $.proxy(this.keydown, this))
179179
}
180180

0 commit comments

Comments
 (0)