deac/chosen
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'highlight_active' of https://github.com/Nagyman/chosen into Nagyman-highlight_active

Browse source 
Conflicts:
	chosen/chosen.jquery.min.js
	chosen/chosen.proto.min.js
This commit is contained in:
Patrick Filler 2011-09-19 15:10:09 -05:00
commit 6571967085
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chosen/chosen.jquery.js
View file

@ -540,7 +540,7 @@
Chosen.prototype.winnow_results_set_highlight = function() { Chosen.prototype.winnow_results_set_highlight = function() {
var do_high, selected_results; var do_high, selected_results;
if (!this.result_highlight) { if (!this.result_highlight) {
selected_results = !this.is_multiple ? this.search_results.find(".result-selected") : []; selected_results = !this.is_multiple ? this.search_results.find(".result-selected.active-result") : [];
do_high = selected_results.length ? selected_results.first() : this.search_results.find(".active-result").first(); do_high = selected_results.length ? selected_results.first() : this.search_results.find(".active-result").first();
if (do_high != null) { if (do_high != null) {
return this.result_do_highlight(do_high); return this.result_do_highlight(do_high);

6
chosen/chosen.jquery.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
chosen/chosen.proto.js
View file

@ -533,7 +533,7 @@
var do_high; var do_high;
if (!this.result_highlight) { if (!this.result_highlight) {
if (!this.is_multiple) { if (!this.is_multiple) {
do_high = this.search_results.down(".result-selected"); do_high = this.search_results.down(".result-selected.active-result");
} }
if (!(do_high != null)) { if (!(do_high != null)) {
do_high = this.search_results.down(".active-result"); do_high = this.search_results.down(".active-result");

6
chosen/chosen.proto.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
coffee/chosen.jquery.coffee
View file

@ -460,7 +460,7 @@ class Chosen
winnow_results_set_highlight: -> winnow_results_set_highlight: ->
if not @result_highlight if not @result_highlight
selected_results = if not @is_multiple then @search_results.find(".result-selected") else [] selected_results = if not @is_multiple then @search_results.find(".result-selected.active-result") else []
do_high = if selected_results.length then selected_results.first() else @search_results.find(".active-result").first() do_high = if selected_results.length then selected_results.first() else @search_results.find(".active-result").first()
this.result_do_highlight do_high if do_high? this.result_do_highlight do_high if do_high?

2
coffee/chosen.proto.coffee
View file

@ -456,7 +456,7 @@ class Chosen
if not @result_highlight if not @result_highlight
if not @is_multiple if not @is_multiple
do_high = @search_results.down(".result-selected") do_high = @search_results.down(".result-selected.active-result")
if not do_high? if not do_high?
do_high = @search_results.down(".active-result") do_high = @search_results.down(".active-result")