Skip to content

Commit 20b7a2c

Browse files
glebmglebm
committed
rake convert
1 parent cb53158 commit 20b7a2c

File tree

23 files changed

+50
-39
lines changed

23 files changed

+50
-39
lines changed

‎assets/javascripts/bootstrap.js‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* Bootstrap v3.3.6 (http://getbootstrap.com)
3-
* Copyright 2011-2015 Twitter, Inc.
3+
* Copyright 2011-2016 Twitter, Inc.
44
* Licensed under the MIT license
55
*/
66

@@ -20,7 +20,7 @@ if (typeof jQuery === 'undefined') {
2020
* Bootstrap: transition.js v3.3.6
2121
* http://getbootstrap.com/javascript/#transitions
2222
* ========================================================================
23-
* Copyright 2011-2015 Twitter, Inc.
23+
* Copyright 2011-2016 Twitter, Inc.
2424
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
2525
* ======================================================================== */
2626

@@ -80,7 +80,7 @@ if (typeof jQuery === 'undefined') {
8080
* Bootstrap: alert.js v3.3.6
8181
* http://getbootstrap.com/javascript/#alerts
8282
* ========================================================================
83-
* Copyright 2011-2015 Twitter, Inc.
83+
* Copyright 2011-2016 Twitter, Inc.
8484
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
8585
* ======================================================================== */
8686

@@ -175,7 +175,7 @@ if (typeof jQuery === 'undefined') {
175175
* Bootstrap: button.js v3.3.6
176176
* http://getbootstrap.com/javascript/#buttons
177177
* ========================================================================
178-
* Copyright 2011-2015 Twitter, Inc.
178+
* Copyright 2011-2016 Twitter, Inc.
179179
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
180180
* ======================================================================== */
181181

@@ -296,7 +296,7 @@ if (typeof jQuery === 'undefined') {
296296
* Bootstrap: carousel.js v3.3.6
297297
* http://getbootstrap.com/javascript/#carousel
298298
* ========================================================================
299-
* Copyright 2011-2015 Twitter, Inc.
299+
* Copyright 2011-2016 Twitter, Inc.
300300
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
301301
* ======================================================================== */
302302

@@ -534,7 +534,7 @@ if (typeof jQuery === 'undefined') {
534534
* Bootstrap: collapse.js v3.3.6
535535
* http://getbootstrap.com/javascript/#collapse
536536
* ========================================================================
537-
* Copyright 2011-2015 Twitter, Inc.
537+
* Copyright 2011-2016 Twitter, Inc.
538538
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
539539
* ======================================================================== */
540540

@@ -746,7 +746,7 @@ if (typeof jQuery === 'undefined') {
746746
* Bootstrap: dropdown.js v3.3.6
747747
* http://getbootstrap.com/javascript/#dropdowns
748748
* ========================================================================
749-
* Copyright 2011-2015 Twitter, Inc.
749+
* Copyright 2011-2016 Twitter, Inc.
750750
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
751751
* ======================================================================== */
752752

@@ -912,7 +912,7 @@ if (typeof jQuery === 'undefined') {
912912
* Bootstrap: modal.js v3.3.6
913913
* http://getbootstrap.com/javascript/#modals
914914
* ========================================================================
915-
* Copyright 2011-2015 Twitter, Inc.
915+
* Copyright 2011-2016 Twitter, Inc.
916916
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
917917
* ======================================================================== */
918918

@@ -1050,7 +1050,9 @@ if (typeof jQuery === 'undefined') {
10501050
$(document)
10511051
.off('focusin.bs.modal') // guard against infinite focus loop
10521052
.on('focusin.bs.modal', $.proxy(function (e) {
1053-
if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
1053+
if (document !== event.target &&
1054+
this.$element[0] !== e.target &&
1055+
!this.$element.has(e.target).length) {
10541056
this.$element.trigger('focus')
10551057
}
10561058
}, this))
@@ -1251,7 +1253,7 @@ if (typeof jQuery === 'undefined') {
12511253
* http://getbootstrap.com/javascript/#tooltip
12521254
* Inspired by the original jQuery.tipsy by Jason Frame
12531255
* ========================================================================
1254-
* Copyright 2011-2015 Twitter, Inc.
1256+
* Copyright 2011-2016 Twitter, Inc.
12551257
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
12561258
* ======================================================================== */
12571259

@@ -1765,7 +1767,7 @@ if (typeof jQuery === 'undefined') {
17651767
* Bootstrap: popover.js v3.3.6
17661768
* http://getbootstrap.com/javascript/#popovers
17671769
* ========================================================================
1768-
* Copyright 2011-2015 Twitter, Inc.
1770+
* Copyright 2011-2016 Twitter, Inc.
17691771
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
17701772
* ======================================================================== */
17711773

@@ -1874,7 +1876,7 @@ if (typeof jQuery === 'undefined') {
18741876
* Bootstrap: scrollspy.js v3.3.6
18751877
* http://getbootstrap.com/javascript/#scrollspy
18761878
* ========================================================================
1877-
* Copyright 2011-2015 Twitter, Inc.
1879+
* Copyright 2011-2016 Twitter, Inc.
18781880
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
18791881
* ======================================================================== */
18801882

@@ -2047,7 +2049,7 @@ if (typeof jQuery === 'undefined') {
20472049
* Bootstrap: tab.js v3.3.6
20482050
* http://getbootstrap.com/javascript/#tabs
20492051
* ========================================================================
2050-
* Copyright 2011-2015 Twitter, Inc.
2052+
* Copyright 2011-2016 Twitter, Inc.
20512053
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
20522054
* ======================================================================== */
20532055

@@ -2203,7 +2205,7 @@ if (typeof jQuery === 'undefined') {
22032205
* Bootstrap: affix.js v3.3.6
22042206
* http://getbootstrap.com/javascript/#affix
22052207
* ========================================================================
2206-
* Copyright 2011-2015 Twitter, Inc.
2208+
* Copyright 2011-2016 Twitter, Inc.
22072209
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
22082210
* ======================================================================== */
22092211

‎assets/javascripts/bootstrap.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/javascripts/bootstrap/affix.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Bootstrap: affix.js v3.3.6
33
* http://getbootstrap.com/javascript/#affix
44
* ========================================================================
5-
* Copyright 2011-2015 Twitter, Inc.
5+
* Copyright 2011-2016 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

‎assets/javascripts/bootstrap/alert.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Bootstrap: alert.js v3.3.6
33
* http://getbootstrap.com/javascript/#alerts
44
* ========================================================================
5-
* Copyright 2011-2015 Twitter, Inc.
5+
* Copyright 2011-2016 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

‎assets/javascripts/bootstrap/button.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Bootstrap: button.js v3.3.6
33
* http://getbootstrap.com/javascript/#buttons
44
* ========================================================================
5-
* Copyright 2011-2015 Twitter, Inc.
5+
* Copyright 2011-2016 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

@@ -108,10 +108,15 @@
108108

109109
$(document)
110110
.on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
111-
var $btn = $(e.target)
112-
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
111+
var $btn = $(e.target).closest('.btn')
113112
Plugin.call($btn, 'toggle')
114-
if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault()
113+
if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) {
114+
// Prevent double click on radios, and the double selections (so cancellation) on checkboxes
115+
e.preventDefault()
116+
// The target component still receive the focus
117+
if ($btn.is('input,button')) $btn.trigger('focus')
118+
else $btn.find('input:visible,button:visible').first().trigger('focus')
119+
}
115120
})
116121
.on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
117122
$(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))

‎assets/javascripts/bootstrap/carousel.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Bootstrap: carousel.js v3.3.6
33
* http://getbootstrap.com/javascript/#carousel
44
* ========================================================================
5-
* Copyright 2011-2015 Twitter, Inc.
5+
* Copyright 2011-2016 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

‎assets/javascripts/bootstrap/collapse.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Bootstrap: collapse.js v3.3.6
33
* http://getbootstrap.com/javascript/#collapse
44
* ========================================================================
5-
* Copyright 2011-2015 Twitter, Inc.
5+
* Copyright 2011-2016 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

‎assets/javascripts/bootstrap/dropdown.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Bootstrap: dropdown.js v3.3.6
33
* http://getbootstrap.com/javascript/#dropdowns
44
* ========================================================================
5-
* Copyright 2011-2015 Twitter, Inc.
5+
* Copyright 2011-2016 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

‎assets/javascripts/bootstrap/modal.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Bootstrap: modal.js v3.3.6
33
* http://getbootstrap.com/javascript/#modals
44
* ========================================================================
5-
* Copyright 2011-2015 Twitter, Inc.
5+
* Copyright 2011-2016 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

@@ -140,7 +140,9 @@
140140
$(document)
141141
.off('focusin.bs.modal') // guard against infinite focus loop
142142
.on('focusin.bs.modal', $.proxy(function (e) {
143-
if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
143+
if (document !== e.target &&
144+
this.$element[0] !== e.target &&
145+
!this.$element.has(e.target).length) {
144146
this.$element.trigger('focus')
145147
}
146148
}, this))

‎assets/javascripts/bootstrap/popover.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Bootstrap: popover.js v3.3.6
33
* http://getbootstrap.com/javascript/#popovers
44
* ========================================================================
5-
* Copyright 2011-2015 Twitter, Inc.
5+
* Copyright 2011-2016 Twitter, Inc.
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
77
* ======================================================================== */
88

0 commit comments

Comments
 (0)