Skip to content

Commit 63f0a72

Browse files
committed
rake convert
1 parent 5904c7d commit 63f0a72

File tree

7 files changed

+21
-11
lines changed

7 files changed

+21
-11
lines changed

assets/javascripts/bootstrap.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,15 @@ if (typeof jQuery === 'undefined') {
281281

282282
$(document)
283283
.on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
284-
var $btn = $(e.target)
285-
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
284+
var $btn = $(e.target).closest('.btn')
286285
Plugin.call($btn, 'toggle')
287-
if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault()
286+
if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) {
287+
// Prevent double click on radios, and the double selections (so cancellation) on checkboxes
288+
e.preventDefault()
289+
// The target component still receive the focus
290+
if ($btn.is('input,button')) $btn.trigger('focus')
291+
else $btn.find('input:visible,button:visible').first().trigger('focus')
292+
}
288293
})
289294
.on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
290295
$(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
@@ -538,6 +543,7 @@ if (typeof jQuery === 'undefined') {
538543
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
539544
* ======================================================================== */
540545

546+
/* jshint latedef: false */
541547

542548
+function ($) {
543549
'use strict';
@@ -1050,7 +1056,7 @@ if (typeof jQuery === 'undefined') {
10501056
$(document)
10511057
.off('focusin.bs.modal') // guard against infinite focus loop
10521058
.on('focusin.bs.modal', $.proxy(function (e) {
1053-
if (document !== event.target &&
1059+
if (document !== e.target &&
10541060
this.$element[0] !== e.target &&
10551061
!this.$element.has(e.target).length) {
10561062
this.$element.trigger('focus')

assets/javascripts/bootstrap.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/javascripts/bootstrap/button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
.on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
111111
var $btn = $(e.target).closest('.btn')
112112
Plugin.call($btn, 'toggle')
113-
if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) {
113+
if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) {
114114
// Prevent double click on radios, and the double selections (so cancellation) on checkboxes
115115
e.preventDefault()
116116
// The target component still receive the focus

assets/javascripts/bootstrap/collapse.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

9+
/* jshint latedef: false */
910

1011
+function ($) {
1112
'use strict';

assets/javascripts/bootstrap/tooltip.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,11 @@
317317

318318
function complete() {
319319
if (that.hoverState != 'in') $tip.detach()
320-
that.$element
321-
.removeAttr('aria-describedby')
322-
.trigger('hidden.bs.' + that.type)
320+
if (that.$element) { // TODO: Check whether guarding this code with this `if` is really necessary.
321+
that.$element
322+
.removeAttr('aria-describedby')
323+
.trigger('hidden.bs.' + that.type)
324+
}
323325
callback && callback()
324326
}
325327

@@ -478,6 +480,7 @@
478480
that.$tip = null
479481
that.$arrow = null
480482
that.$viewport = null
483+
that.$element = null
481484
})
482485
}
483486

assets/stylesheets/bootstrap/_panels.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
}
215215

216216

217-
// Collapsable panels (aka, accordion)
217+
// Collapsible panels (aka, accordion)
218218
//
219219
// Wrap a series of panels in `.panel-group` to turn them into an accordion with
220220
// the help of our collapse JavaScript plugin.

lib/bootstrap-sass/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module Bootstrap
22
VERSION = '3.3.6'
3-
BOOTSTRAP_SHA = '562d2239c0b8ef56dae04bd44eac0c419def6467'
3+
BOOTSTRAP_SHA = '7c86bc9664ddc3a1965fe91d7a0db97eb9348448'
44
end

0 commit comments

Comments
 (0)