1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 05:19:15 +02:00

make active selector more specific #2043 and rebuild

This commit is contained in:
Jacob Thornton
2012-06-02 22:10:35 -07:00
parent 4a276b1620
commit 2d3a0babd2
7 changed files with 31 additions and 18 deletions

View File

@@ -290,7 +290,7 @@
}
, to: function (pos) {
var $active = this.$element.find('.active')
var $active = this.$element.find('.item.active')
, children = $active.parent().children()
, activePos = children.index($active)
, that = this
@@ -486,7 +486,7 @@
this.$element[dimension](0)
this.transition('addClass', $.Event('show'), 'shown')
this.$element[dimension](this.$element[0][scroll])
$.support.transition && this.$element[dimension](this.$element[0][scroll])
}
, hide: function () {
@@ -1676,9 +1676,7 @@
}
, lookup: function (event) {
var that = this
, items
, q
var items
this.query = this.$element.val()
@@ -1686,7 +1684,15 @@
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)
})
@@ -1889,4 +1895,4 @@
})
})
}(window.jQuery);
}(window.jQuery);