twitter-bootswatch-rails 3.0.3.0 → 3.1.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/twitter/bootstrap/affix.js +34 -23
- data/app/assets/javascripts/twitter/bootstrap/alert.js +5 -15
- data/app/assets/javascripts/twitter/bootstrap/button.js +21 -29
- data/app/assets/javascripts/twitter/bootstrap/carousel.js +16 -28
- data/app/assets/javascripts/twitter/bootstrap/collapse.js +7 -16
- data/app/assets/javascripts/twitter/bootstrap/dropdown.js +19 -26
- data/app/assets/javascripts/twitter/bootstrap/modal.js +25 -28
- data/app/assets/javascripts/twitter/bootstrap/popover.js +14 -21
- data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +16 -21
- data/app/assets/javascripts/twitter/bootstrap/tab.js +7 -17
- data/app/assets/javascripts/twitter/bootstrap/tooltip.js +52 -39
- data/app/assets/javascripts/twitter/bootstrap/transition.js +11 -19
- data/lib/generators/bootswatch/install/templates/loader.js.tt +1 -1
- data/lib/generators/bootswatch/install/templates/mixins.less.tt +130 -49
- data/lib/generators/bootswatch/install/templates/variables.less.tt +346 -161
- data/lib/twitter/bootswatch/rails/version.rb +1 -1
- data/vendor/toolkit/twitter/bootstrap/badges.less +4 -0
- data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +4 -1
- data/vendor/toolkit/twitter/bootstrap/button-groups.less +10 -11
- data/vendor/toolkit/twitter/bootstrap/buttons.less +8 -8
- data/vendor/toolkit/twitter/bootstrap/code.less +10 -0
- data/vendor/toolkit/twitter/bootstrap/dropdowns.less +28 -2
- data/vendor/toolkit/twitter/bootstrap/forms.less +82 -38
- data/vendor/toolkit/twitter/bootstrap/glyphicons.less +1 -5
- data/vendor/toolkit/twitter/bootstrap/grid.less +26 -5
- data/vendor/toolkit/twitter/bootstrap/input-groups.less +39 -18
- data/vendor/toolkit/twitter/bootstrap/jumbotron.less +3 -5
- data/vendor/toolkit/twitter/bootstrap/list-group.less +25 -3
- data/vendor/toolkit/twitter/bootstrap/mixins.less +130 -49
- data/vendor/toolkit/twitter/bootstrap/modals.less +16 -7
- data/vendor/toolkit/twitter/bootstrap/navbar.less +24 -20
- data/vendor/toolkit/twitter/bootstrap/navs.less +2 -2
- data/vendor/toolkit/twitter/bootstrap/normalize.less +139 -122
- data/vendor/toolkit/twitter/bootstrap/pager.less +5 -5
- data/vendor/toolkit/twitter/bootstrap/pagination.less +6 -3
- data/vendor/toolkit/twitter/bootstrap/panels.less +64 -16
- data/vendor/toolkit/twitter/bootstrap/print.less +0 -4
- data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +13 -129
- data/vendor/toolkit/twitter/bootstrap/scaffolding.less +17 -2
- data/vendor/toolkit/twitter/bootstrap/tables.less +3 -1
- data/vendor/toolkit/twitter/bootstrap/theme.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/tooltip.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/type.less +78 -63
- data/vendor/toolkit/twitter/bootstrap/variables.less +346 -161
- data/vendor/toolkit/twitter/bootstrap/wells.less +1 -1
- metadata +2 -3
- data/lib/generators/bootswatch/import/import_generator.rb +0 -49
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a55684eb64a0760b7ab44b4365b04b2746acea21
|
4
|
+
data.tar.gz: 3339284d1d64dba67023ab88816591add3eebe6f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f1fab2a87eda6b5aca3a2b59d80931fe12ba1c708af26b1680973fca4f0a56d9dfbf25eeffd8ecf61c221071ae0aaacfa713d1b56bb2de3865ad57c006ec4ee5
|
7
|
+
data.tar.gz: 9ff85cbb119b71d31db02b5eae434066e014a930bf09e26597038f2124b92ffdac89e623bb2d3026bec0535f98b88ad3f8b8c3ee0e1fe7e753eedb3e860a084c
|
@@ -1,24 +1,14 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: affix.js v3.0
|
2
|
+
* Bootstrap: affix.js v3.1.0
|
3
3
|
* http://getbootstrap.com/javascript/#affix
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
6
|
-
*
|
7
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
* you may not use this file except in compliance with the License.
|
9
|
-
* You may obtain a copy of the License at
|
10
|
-
*
|
11
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
*
|
13
|
-
* Unless required by applicable law or agreed to in writing, software
|
14
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
* See the License for the specific language governing permissions and
|
17
|
-
* limitations under the License.
|
5
|
+
* Copyright 2011-2014 Twitter, Inc.
|
6
|
+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
18
7
|
* ======================================================================== */
|
19
8
|
|
20
9
|
|
21
|
-
+function ($) {
|
10
|
+
+function ($) {
|
11
|
+
'use strict';
|
22
12
|
|
23
13
|
// AFFIX CLASS DEFINITION
|
24
14
|
// ======================
|
@@ -29,9 +19,10 @@
|
|
29
19
|
.on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
|
30
20
|
.on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
|
31
21
|
|
32
|
-
this.$element
|
33
|
-
this.affixed
|
34
|
-
this.unpin
|
22
|
+
this.$element = $(element)
|
23
|
+
this.affixed =
|
24
|
+
this.unpin =
|
25
|
+
this.pinnedOffset = null
|
35
26
|
|
36
27
|
this.checkPosition()
|
37
28
|
}
|
@@ -42,6 +33,14 @@
|
|
42
33
|
offset: 0
|
43
34
|
}
|
44
35
|
|
36
|
+
Affix.prototype.getPinnedOffset = function () {
|
37
|
+
if (this.pinnedOffset) return this.pinnedOffset
|
38
|
+
this.$element.removeClass(Affix.RESET).addClass('affix')
|
39
|
+
var scrollTop = this.$window.scrollTop()
|
40
|
+
var position = this.$element.offset()
|
41
|
+
return (this.pinnedOffset = position.top - scrollTop)
|
42
|
+
}
|
43
|
+
|
45
44
|
Affix.prototype.checkPositionWithEventLoop = function () {
|
46
45
|
setTimeout($.proxy(this.checkPosition, this), 1)
|
47
46
|
}
|
@@ -56,9 +55,11 @@
|
|
56
55
|
var offsetTop = offset.top
|
57
56
|
var offsetBottom = offset.bottom
|
58
57
|
|
58
|
+
if (this.affixed == 'top') position.top += scrollTop
|
59
|
+
|
59
60
|
if (typeof offset != 'object') offsetBottom = offsetTop = offset
|
60
|
-
if (typeof offsetTop == 'function') offsetTop = offset.top()
|
61
|
-
if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
|
61
|
+
if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element)
|
62
|
+
if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
|
62
63
|
|
63
64
|
var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false :
|
64
65
|
offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
|
@@ -67,13 +68,23 @@
|
|
67
68
|
if (this.affixed === affix) return
|
68
69
|
if (this.unpin) this.$element.css('top', '')
|
69
70
|
|
71
|
+
var affixType = 'affix' + (affix ? '-' + affix : '')
|
72
|
+
var e = $.Event(affixType + '.bs.affix')
|
73
|
+
|
74
|
+
this.$element.trigger(e)
|
75
|
+
|
76
|
+
if (e.isDefaultPrevented()) return
|
77
|
+
|
70
78
|
this.affixed = affix
|
71
|
-
this.unpin
|
79
|
+
this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
|
72
80
|
|
73
|
-
this.$element
|
81
|
+
this.$element
|
82
|
+
.removeClass(Affix.RESET)
|
83
|
+
.addClass(affixType)
|
84
|
+
.trigger($.Event(affixType.replace('affix', 'affixed')))
|
74
85
|
|
75
86
|
if (affix == 'bottom') {
|
76
|
-
this.$element.offset({ top:
|
87
|
+
this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() })
|
77
88
|
}
|
78
89
|
}
|
79
90
|
|
@@ -1,24 +1,14 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: alert.js v3.0
|
2
|
+
* Bootstrap: alert.js v3.1.0
|
3
3
|
* http://getbootstrap.com/javascript/#alerts
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
6
|
-
*
|
7
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
* you may not use this file except in compliance with the License.
|
9
|
-
* You may obtain a copy of the License at
|
10
|
-
*
|
11
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
*
|
13
|
-
* Unless required by applicable law or agreed to in writing, software
|
14
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
* See the License for the specific language governing permissions and
|
17
|
-
* limitations under the License.
|
5
|
+
* Copyright 2011-2014 Twitter, Inc.
|
6
|
+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
18
7
|
* ======================================================================== */
|
19
8
|
|
20
9
|
|
21
|
-
+function ($) {
|
10
|
+
+function ($) {
|
11
|
+
'use strict';
|
22
12
|
|
23
13
|
// ALERT CLASS DEFINITION
|
24
14
|
// ======================
|
@@ -1,31 +1,22 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: button.js v3.0
|
2
|
+
* Bootstrap: button.js v3.1.0
|
3
3
|
* http://getbootstrap.com/javascript/#buttons
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
6
|
-
*
|
7
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
* you may not use this file except in compliance with the License.
|
9
|
-
* You may obtain a copy of the License at
|
10
|
-
*
|
11
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
*
|
13
|
-
* Unless required by applicable law or agreed to in writing, software
|
14
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
* See the License for the specific language governing permissions and
|
17
|
-
* limitations under the License.
|
5
|
+
* Copyright 2011-2014 Twitter, Inc.
|
6
|
+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
18
7
|
* ======================================================================== */
|
19
8
|
|
20
9
|
|
21
|
-
+function ($) {
|
10
|
+
+function ($) {
|
11
|
+
'use strict';
|
22
12
|
|
23
13
|
// BUTTON PUBLIC CLASS DEFINITION
|
24
14
|
// ==============================
|
25
15
|
|
26
16
|
var Button = function (element, options) {
|
27
|
-
this.$element
|
28
|
-
this.options
|
17
|
+
this.$element = $(element)
|
18
|
+
this.options = $.extend({}, Button.DEFAULTS, options)
|
19
|
+
this.isLoading = false
|
29
20
|
}
|
30
21
|
|
31
22
|
Button.DEFAULTS = {
|
@@ -45,25 +36,26 @@
|
|
45
36
|
$el[val](data[state] || this.options[state])
|
46
37
|
|
47
38
|
// push to event loop to allow forms to submit
|
48
|
-
setTimeout(function () {
|
49
|
-
state == 'loadingText'
|
50
|
-
|
51
|
-
$el.
|
52
|
-
|
39
|
+
setTimeout($.proxy(function () {
|
40
|
+
if (state == 'loadingText') {
|
41
|
+
this.isLoading = true
|
42
|
+
$el.addClass(d).attr(d, d)
|
43
|
+
} else if (this.isLoading) {
|
44
|
+
this.isLoading = false
|
45
|
+
$el.removeClass(d).removeAttr(d)
|
46
|
+
}
|
47
|
+
}, this), 0)
|
53
48
|
}
|
54
49
|
|
55
50
|
Button.prototype.toggle = function () {
|
56
|
-
var $parent = this.$element.closest('[data-toggle="buttons"]')
|
57
51
|
var changed = true
|
52
|
+
var $parent = this.$element.closest('[data-toggle="buttons"]')
|
58
53
|
|
59
54
|
if ($parent.length) {
|
60
55
|
var $input = this.$element.find('input')
|
61
|
-
if ($input.prop('type')
|
62
|
-
|
63
|
-
|
64
|
-
changed = false
|
65
|
-
else
|
66
|
-
$parent.find('.active').removeClass('active')
|
56
|
+
if ($input.prop('type') == 'radio') {
|
57
|
+
if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
|
58
|
+
else $parent.find('.active').removeClass('active')
|
67
59
|
}
|
68
60
|
if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
|
69
61
|
}
|
@@ -1,24 +1,14 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: carousel.js v3.0
|
2
|
+
* Bootstrap: carousel.js v3.1.0
|
3
3
|
* http://getbootstrap.com/javascript/#carousel
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
6
|
-
*
|
7
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
* you may not use this file except in compliance with the License.
|
9
|
-
* You may obtain a copy of the License at
|
10
|
-
*
|
11
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
*
|
13
|
-
* Unless required by applicable law or agreed to in writing, software
|
14
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
* See the License for the specific language governing permissions and
|
17
|
-
* limitations under the License.
|
5
|
+
* Copyright 2011-2014 Twitter, Inc.
|
6
|
+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
18
7
|
* ======================================================================== */
|
19
8
|
|
20
9
|
|
21
|
-
+function ($) {
|
10
|
+
+function ($) {
|
11
|
+
'use strict';
|
22
12
|
|
23
13
|
// CAROUSEL CLASS DEFINITION
|
24
14
|
// =========================
|
@@ -39,9 +29,9 @@
|
|
39
29
|
}
|
40
30
|
|
41
31
|
Carousel.DEFAULTS = {
|
42
|
-
interval: 5000
|
43
|
-
|
44
|
-
|
32
|
+
interval: 5000,
|
33
|
+
pause: 'hover',
|
34
|
+
wrap: true
|
45
35
|
}
|
46
36
|
|
47
37
|
Carousel.prototype.cycle = function (e) {
|
@@ -78,7 +68,7 @@
|
|
78
68
|
Carousel.prototype.pause = function (e) {
|
79
69
|
e || (this.paused = true)
|
80
70
|
|
81
|
-
if (this.$element.find('.next, .prev').length && $.support.transition
|
71
|
+
if (this.$element.find('.next, .prev').length && $.support.transition) {
|
82
72
|
this.$element.trigger($.support.transition.end)
|
83
73
|
this.cycle(true)
|
84
74
|
}
|
@@ -111,13 +101,15 @@
|
|
111
101
|
$next = this.$element.find('.item')[fallback]()
|
112
102
|
}
|
113
103
|
|
114
|
-
this.sliding =
|
115
|
-
|
116
|
-
isCycling && this.pause()
|
104
|
+
if ($next.hasClass('active')) return this.sliding = false
|
117
105
|
|
118
106
|
var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
|
107
|
+
this.$element.trigger(e)
|
108
|
+
if (e.isDefaultPrevented()) return
|
119
109
|
|
120
|
-
|
110
|
+
this.sliding = true
|
111
|
+
|
112
|
+
isCycling && this.pause()
|
121
113
|
|
122
114
|
if (this.$indicators.length) {
|
123
115
|
this.$indicators.find('.active').removeClass('active')
|
@@ -128,8 +120,6 @@
|
|
128
120
|
}
|
129
121
|
|
130
122
|
if ($.support.transition && this.$element.hasClass('slide')) {
|
131
|
-
this.$element.trigger(e)
|
132
|
-
if (e.isDefaultPrevented()) return
|
133
123
|
$next.addClass(type)
|
134
124
|
$next[0].offsetWidth // force reflow
|
135
125
|
$active.addClass(direction)
|
@@ -141,10 +131,8 @@
|
|
141
131
|
that.sliding = false
|
142
132
|
setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
|
143
133
|
})
|
144
|
-
.emulateTransitionEnd(
|
134
|
+
.emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
|
145
135
|
} else {
|
146
|
-
this.$element.trigger(e)
|
147
|
-
if (e.isDefaultPrevented()) return
|
148
136
|
$active.removeClass('active')
|
149
137
|
$next.addClass('active')
|
150
138
|
this.sliding = false
|
@@ -1,24 +1,14 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: collapse.js v3.0
|
2
|
+
* Bootstrap: collapse.js v3.1.0
|
3
3
|
* http://getbootstrap.com/javascript/#collapse
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
6
|
-
*
|
7
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
* you may not use this file except in compliance with the License.
|
9
|
-
* You may obtain a copy of the License at
|
10
|
-
*
|
11
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
*
|
13
|
-
* Unless required by applicable law or agreed to in writing, software
|
14
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
* See the License for the specific language governing permissions and
|
17
|
-
* limitations under the License.
|
5
|
+
* Copyright 2011-2014 Twitter, Inc.
|
6
|
+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
18
7
|
* ======================================================================== */
|
19
8
|
|
20
9
|
|
21
|
-
+function ($) {
|
10
|
+
+function ($) {
|
11
|
+
'use strict';
|
22
12
|
|
23
13
|
// COLLAPSE PUBLIC CLASS DEFINITION
|
24
14
|
// ================================
|
@@ -69,7 +59,7 @@
|
|
69
59
|
var complete = function () {
|
70
60
|
this.$element
|
71
61
|
.removeClass('collapsing')
|
72
|
-
.addClass('in')
|
62
|
+
.addClass('collapse in')
|
73
63
|
[dimension]('auto')
|
74
64
|
this.transitioning = 0
|
75
65
|
this.$element.trigger('shown.bs.collapse')
|
@@ -137,6 +127,7 @@
|
|
137
127
|
var data = $this.data('bs.collapse')
|
138
128
|
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
|
139
129
|
|
130
|
+
if (!data && options.toggle && option == 'show') option = !option
|
140
131
|
if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
|
141
132
|
if (typeof option == 'string') data[option]()
|
142
133
|
})
|
@@ -1,24 +1,14 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: dropdown.js v3.0
|
2
|
+
* Bootstrap: dropdown.js v3.1.0
|
3
3
|
* http://getbootstrap.com/javascript/#dropdowns
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
6
|
-
*
|
7
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
* you may not use this file except in compliance with the License.
|
9
|
-
* You may obtain a copy of the License at
|
10
|
-
*
|
11
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
*
|
13
|
-
* Unless required by applicable law or agreed to in writing, software
|
14
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
* See the License for the specific language governing permissions and
|
17
|
-
* limitations under the License.
|
5
|
+
* Copyright 2011-2014 Twitter, Inc.
|
6
|
+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
18
7
|
* ======================================================================== */
|
19
8
|
|
20
9
|
|
21
|
-
+function ($) {
|
10
|
+
+function ($) {
|
11
|
+
'use strict';
|
22
12
|
|
23
13
|
// DROPDOWN CLASS DEFINITION
|
24
14
|
// =========================
|
@@ -45,13 +35,14 @@
|
|
45
35
|
$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
|
46
36
|
}
|
47
37
|
|
48
|
-
|
38
|
+
var relatedTarget = { relatedTarget: this }
|
39
|
+
$parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
|
49
40
|
|
50
41
|
if (e.isDefaultPrevented()) return
|
51
42
|
|
52
43
|
$parent
|
53
44
|
.toggleClass('open')
|
54
|
-
.trigger('shown.bs.dropdown')
|
45
|
+
.trigger('shown.bs.dropdown', relatedTarget)
|
55
46
|
|
56
47
|
$this.focus()
|
57
48
|
}
|
@@ -77,7 +68,8 @@
|
|
77
68
|
return $this.click()
|
78
69
|
}
|
79
70
|
|
80
|
-
var
|
71
|
+
var desc = ' li:not(.divider):visible a'
|
72
|
+
var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc)
|
81
73
|
|
82
74
|
if (!$items.length) return
|
83
75
|
|
@@ -85,19 +77,20 @@
|
|
85
77
|
|
86
78
|
if (e.keyCode == 38 && index > 0) index-- // up
|
87
79
|
if (e.keyCode == 40 && index < $items.length - 1) index++ // down
|
88
|
-
if (!~index) index=0
|
80
|
+
if (!~index) index = 0
|
89
81
|
|
90
82
|
$items.eq(index).focus()
|
91
83
|
}
|
92
84
|
|
93
|
-
function clearMenus() {
|
85
|
+
function clearMenus(e) {
|
94
86
|
$(backdrop).remove()
|
95
|
-
$(toggle).each(function (
|
87
|
+
$(toggle).each(function () {
|
96
88
|
var $parent = getParent($(this))
|
89
|
+
var relatedTarget = { relatedTarget: this }
|
97
90
|
if (!$parent.hasClass('open')) return
|
98
|
-
$parent.trigger(e = $.Event('hide.bs.dropdown'))
|
91
|
+
$parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
|
99
92
|
if (e.isDefaultPrevented()) return
|
100
|
-
$parent.removeClass('open').trigger('hidden.bs.dropdown')
|
93
|
+
$parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
|
101
94
|
})
|
102
95
|
}
|
103
96
|
|
@@ -106,7 +99,7 @@
|
|
106
99
|
|
107
100
|
if (!selector) {
|
108
101
|
selector = $this.attr('href')
|
109
|
-
selector = selector &&
|
102
|
+
selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
110
103
|
}
|
111
104
|
|
112
105
|
var $parent = selector && $(selector)
|
@@ -148,7 +141,7 @@
|
|
148
141
|
$(document)
|
149
142
|
.on('click.bs.dropdown.data-api', clearMenus)
|
150
143
|
.on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
|
151
|
-
.on('click.bs.dropdown.data-api'
|
152
|
-
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]'
|
144
|
+
.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
145
|
+
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown)
|
153
146
|
|
154
147
|
}(jQuery);
|