mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
make active selector more specific #2043 and rebuild
This commit is contained in:
parent
4a276b1620
commit
2d3a0babd2
7 changed files with 31 additions and 18 deletions
2
docs/assets/js/bootstrap-carousel.js
vendored
2
docs/assets/js/bootstrap-carousel.js
vendored
|
@ -46,7 +46,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
, to: function (pos) {
|
, to: function (pos) {
|
||||||
var $active = this.$element.find('.active')
|
var $active = this.$element.find('.item.active')
|
||||||
, children = $active.parent().children()
|
, children = $active.parent().children()
|
||||||
, activePos = children.index($active)
|
, activePos = children.index($active)
|
||||||
, that = this
|
, that = this
|
||||||
|
|
2
docs/assets/js/bootstrap-collapse.js
vendored
2
docs/assets/js/bootstrap-collapse.js
vendored
|
@ -67,7 +67,7 @@
|
||||||
|
|
||||||
this.$element[dimension](0)
|
this.$element[dimension](0)
|
||||||
this.transition('addClass', $.Event('show'), 'shown')
|
this.transition('addClass', $.Event('show'), 'shown')
|
||||||
this.$element[dimension](this.$element[0][scroll])
|
$.support.transition && this.$element[dimension](this.$element[0][scroll])
|
||||||
}
|
}
|
||||||
|
|
||||||
, hide: function () {
|
, hide: function () {
|
||||||
|
|
16
docs/assets/js/bootstrap-typeahead.js
vendored
16
docs/assets/js/bootstrap-typeahead.js
vendored
|
@ -77,9 +77,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
, lookup: function (event) {
|
, lookup: function (event) {
|
||||||
var that = this
|
var items
|
||||||
, items
|
|
||||||
, q
|
|
||||||
|
|
||||||
this.query = this.$element.val()
|
this.query = this.$element.val()
|
||||||
|
|
||||||
|
@ -87,7 +85,15 @@
|
||||||
return this.shown ? this.hide() : this
|
return this.shown ? this.hide() : this
|
||||||
}
|
}
|
||||||
|
|
||||||
items = $.grep(this.source, function (item) {
|
items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
|
||||||
|
|
||||||
|
return items ? this.process(items) : this
|
||||||
|
}
|
||||||
|
|
||||||
|
, process: function (items) {
|
||||||
|
var that = this
|
||||||
|
|
||||||
|
items = $.grep(items, function (item) {
|
||||||
return that.matcher(item)
|
return that.matcher(item)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -290,4 +296,4 @@
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
20
docs/assets/js/bootstrap.js
vendored
20
docs/assets/js/bootstrap.js
vendored
|
@ -290,7 +290,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
, to: function (pos) {
|
, to: function (pos) {
|
||||||
var $active = this.$element.find('.active')
|
var $active = this.$element.find('.item.active')
|
||||||
, children = $active.parent().children()
|
, children = $active.parent().children()
|
||||||
, activePos = children.index($active)
|
, activePos = children.index($active)
|
||||||
, that = this
|
, that = this
|
||||||
|
@ -486,7 +486,7 @@
|
||||||
|
|
||||||
this.$element[dimension](0)
|
this.$element[dimension](0)
|
||||||
this.transition('addClass', $.Event('show'), 'shown')
|
this.transition('addClass', $.Event('show'), 'shown')
|
||||||
this.$element[dimension](this.$element[0][scroll])
|
$.support.transition && this.$element[dimension](this.$element[0][scroll])
|
||||||
}
|
}
|
||||||
|
|
||||||
, hide: function () {
|
, hide: function () {
|
||||||
|
@ -1676,9 +1676,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
, lookup: function (event) {
|
, lookup: function (event) {
|
||||||
var that = this
|
var items
|
||||||
, items
|
|
||||||
, q
|
|
||||||
|
|
||||||
this.query = this.$element.val()
|
this.query = this.$element.val()
|
||||||
|
|
||||||
|
@ -1686,7 +1684,15 @@
|
||||||
return this.shown ? this.hide() : this
|
return this.shown ? this.hide() : this
|
||||||
}
|
}
|
||||||
|
|
||||||
items = $.grep(this.source, function (item) {
|
items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
|
||||||
|
|
||||||
|
return items ? this.process(items) : this
|
||||||
|
}
|
||||||
|
|
||||||
|
, process: function (items) {
|
||||||
|
var that = this
|
||||||
|
|
||||||
|
items = $.grep(items, function (item) {
|
||||||
return that.matcher(item)
|
return that.matcher(item)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -1889,4 +1895,4 @@
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
|
|
2
docs/assets/js/bootstrap.min.js
vendored
2
docs/assets/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -1454,9 +1454,9 @@ $('.carousel').carousel({
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td>source</td>
|
<td>source</td>
|
||||||
<td>array</td>
|
<td>array, function</td>
|
||||||
<td>[ ]</td>
|
<td>[ ]</td>
|
||||||
<td>The data source to query against.</td>
|
<td>The data source to query against. May be an array of strings or a function. The function is passed two arguments, the <code>query</code> value in the input field and the <code>process</code> callback. The function may be used synchronously by returning the data source directly or asynchronously via the <code>process</code> callback's single argument.</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>items</td>
|
<td>items</td>
|
||||||
|
@ -1497,6 +1497,7 @@ $('.carousel').carousel({
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
||||||
<!-- Footer
|
<!-- Footer
|
||||||
================================================== -->
|
================================================== -->
|
||||||
<footer class="footer">
|
<footer class="footer">
|
||||||
|
|
2
js/bootstrap-carousel.js
vendored
2
js/bootstrap-carousel.js
vendored
|
@ -46,7 +46,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
, to: function (pos) {
|
, to: function (pos) {
|
||||||
var $active = this.$element.find('.active')
|
var $active = this.$element.find('.item.active')
|
||||||
, children = $active.parent().children()
|
, children = $active.parent().children()
|
||||||
, activePos = children.index($active)
|
, activePos = children.index($active)
|
||||||
, that = this
|
, that = this
|
||||||
|
|
Loading…
Add table
Reference in a new issue