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

Update to latest version of Chosen

Browse source
This commit is contained in:
Patrick Filler 2012-01-19 17:48:26 -06:00
parent fb141af8ac
commit f3cf4ff7e2
3 changed files with 102 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
chosen/chosen-sprite.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 1.5 KiB

145
chosen/chosen.css
View file

@ -23,29 +23,32 @@
/* @group Single Chosen */ /* @group Single Chosen */
.chzn-container-single .chzn-single { .chzn-container-single .chzn-single {
background-color: #fff; background-color: #ffffff;
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white)); background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #f4f4f4), color-stop(0.48, #eeeeee), color-stop(0.5, #f6f6f6), color-stop(0.8, #ffffff));
background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%); background-image: -webkit-linear-gradient(center bottom, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%); background-image: -moz-linear-gradient(center bottom, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
background-image: -o-linear-gradient(top, #eeeeee 0%,#ffffff 50%); background-image: -o-linear-gradient(top, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 50%); background-image: -ms-linear-gradient(top, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
background-image: linear-gradient(top, #eeeeee 0%,#ffffff 50%); background-image: linear-gradient(top, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
-webkit-border-radius: 4px; -webkit-border-radius: 5px;
-moz-border-radius : 4px; -moz-border-radius : 5px;
border-radius : 4px; border-radius : 5px;
-moz-background-clip : padding; -moz-background-clip : padding;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
background-clip : padding-box; background-clip : padding-box;
border: 1px solid #aaa; border: 1px solid #aaaaaa;
-webkit-box-shadow: 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
-moz-box-shadow : 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
box-shadow : 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
display: block; display: block;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
position: relative; position: relative;
height: 26px; height: 23px;
line-height: 26px; line-height: 23px;
padding: 0 0 0 8px; padding: 0 0 0 8px;
color: #444; color: #444444;
text-decoration: none; text-decoration: none;
} }
.chzn-container-single .chzn-single span { .chzn-container-single .chzn-single span {
@ -61,7 +64,7 @@
display: block; display: block;
position: absolute; position: absolute;
right: 26px; right: 26px;
top: 8px; top: 6px;
width: 12px; width: 12px;
height: 13px; height: 13px;
font-size: 1px; font-size: 1px;
@ -71,21 +74,6 @@
background-position: right -11px; background-position: right -11px;
} }
.chzn-container-single .chzn-single div { .chzn-container-single .chzn-single div {
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius : 0 4px 4px 0;
border-radius : 0 4px 4px 0;
-moz-background-clip : padding;
-webkit-background-clip: padding-box;
background-clip : padding-box;
background: #ccc;
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
background-image: -ms-linear-gradient(top, #cccccc 0%,#eeeeee 60%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cccccc', endColorstr='#eeeeee',GradientType=0 );
background-image: linear-gradient(top, #cccccc 0%,#eeeeee 60%);
border-left: 1px solid #aaa;
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
@ -94,7 +82,7 @@
width: 18px; width: 18px;
} }
.chzn-container-single .chzn-single div b { .chzn-container-single .chzn-single div b {
background: url('chosen-sprite.png') no-repeat 0 1px; background: url('chosen-sprite.png') no-repeat 0 0;
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -143,9 +131,9 @@
background-image: -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%); background-image: -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
background-image: -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%); background-image: -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
background-image: -o-linear-gradient(bottom, white 85%, #eeeeee 99%); background-image: -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
background-image: -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%); background-image: -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
background-image: linear-gradient(top, #ffffff 85%,#eeeeee 99%); background-image: linear-gradient(top, #ffffff 85%, #eeeeee 99%);
border: 1px solid #aaa; border: 1px solid #aaa;
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -168,6 +156,9 @@
color: #666; color: #666;
background: transparent !important; background: transparent !important;
border: 0 !important; border: 0 !important;
font-family: sans-serif;
font-size: 100%;
height: 15px;
padding: 5px; padding: 5px;
margin: 1px 0; margin: 1px 0;
outline: 0; outline: 0;
@ -187,17 +178,20 @@
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
background-clip : padding-box; background-clip : padding-box;
background-color: #e4e4e4; background-color: #e4e4e4;
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #e4e4e4), color-stop(0.7, #eeeeee)); background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.48, #e8e8e8), color-stop(0.5, #f0f0f0), color-stop(0.8, #f4f4f4));
background-image: -webkit-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%); background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
background-image: -moz-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%); background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
background-image: -o-linear-gradient(bottom, #e4e4e4 0%, #eeeeee 70%); background-image: -o-linear-gradient(top, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
background-image: -ms-linear-gradient(top, #e4e4e4 0%,#eeeeee 70%); background-image: -ms-linear-gradient(top, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e4e4e4', endColorstr='#eeeeee',GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#f4f4f4',GradientType=0 );
background-image: linear-gradient(top, #e4e4e4 0%,#eeeeee 70%); background-image: linear-gradient(top, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
-webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
-moz-box-shadow : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
box-shadow : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
color: #333; color: #333;
border: 1px solid #b4b4b4; border: 1px solid #aaaaaa;
line-height: 13px; line-height: 13px;
padding: 3px 19px 3px 6px; padding: 3px 20px 3px 5px;
margin: 3px 0 3px 5px; margin: 3px 0 3px 5px;
position: relative; position: relative;
} }
@ -228,7 +222,7 @@
/* @group Results */ /* @group Results */
.chzn-container .chzn-results { .chzn-container .chzn-results {
margin: 0 4px 4px 0; margin: 0 4px 4px 0;
max-height: 190px; max-height: 240px;
padding: 0 0 0 4px; padding: 0 0 0 4px;
position: relative; position: relative;
overflow-x: hidden; overflow-x: hidden;
@ -240,8 +234,8 @@
} }
.chzn-container .chzn-results li { .chzn-container .chzn-results li {
display: none; display: none;
line-height: 80%; line-height: 15px;
padding: 7px 7px 8px; padding: 5px 6px;
margin: 0; margin: 0;
list-style: none; list-style: none;
} }
@ -250,7 +244,14 @@
display: list-item; display: list-item;
} }
.chzn-container .chzn-results .highlighted { .chzn-container .chzn-results .highlighted {
background: #3875d7; background-color: #3875d7;
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.1, #2a62bc), color-stop(0.8, #3875d7));
background-image: -webkit-linear-gradient(center bottom, #2a62bc 10%, #3875d7 80%);
background-image: -moz-linear-gradient(center bottom, #2a62bc 10%, #3875d7 80%);
background-image: -o-linear-gradient(bottom, #2a62bc 10%, #3875d7 80%);
background-image: -ms-linear-gradient(top, #2a62bc 10%, #3875d7 80%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2a62bc', endColorstr='#3875d7',GradientType=0 );
background-image: linear-gradient(top, #2a62bc 10%, #3875d7 80%);
color: #fff; color: #fff;
} }
.chzn-container .chzn-results li em { .chzn-container .chzn-results li em {
@ -270,11 +271,34 @@
font-weight: bold; font-weight: bold;
} }
.chzn-container .chzn-results .group-option { .chzn-container .chzn-results .group-option {
padding-left: 20px; padding-left: 15px;
} }
.chzn-container-multi .chzn-drop .result-selected { .chzn-container-multi .chzn-drop .result-selected {
display: none; display: none;
} }
.chzn-container .chzn-results-scroll {
background: white;
margin: 0px 4px;
position: absolute;
text-align: center;
width: 321px; /* This should by dynamic with js */
z-index: 1;
}
.chzn-container .chzn-results-scroll span {
display: inline-block;
height: 17px;
text-indent: -5000px;
width: 9px;
}
.chzn-container .chzn-results-scroll-down {
bottom: 0;
}
.chzn-container .chzn-results-scroll-down span {
background: url('chosen-sprite.png') no-repeat -4px -3px;
}
.chzn-container .chzn-results-scroll-up span {
background: url('chosen-sprite.png') no-repeat -22px -3px;
}
/* @end */ /* @end */
/* @group Active */ /* @group Active */
@ -292,13 +316,13 @@
-o-box-shadow : 0 1px 0 #fff inset; -o-box-shadow : 0 1px 0 #fff inset;
box-shadow : 0 1px 0 #fff inset; box-shadow : 0 1px 0 #fff inset;
background-color: #eee; background-color: #eee;
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee)); background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.2, white), color-stop(0.8, #eeeeee));
background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%); background-image: -webkit-linear-gradient(center bottom, white 20%, #eeeeee 80%);
background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%); background-image: -moz-linear-gradient(center bottom, white 20%, #eeeeee 80%);
background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%); background-image: -o-linear-gradient(bottom, white 20%, #eeeeee 80%);
background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%); background-image: -ms-linear-gradient(top, #ffffff 20%,#eeeeee 80%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%); background-image: linear-gradient(top, #ffffff 20%,#eeeeee 80%);
-webkit-border-bottom-left-radius : 0; -webkit-border-bottom-left-radius : 0;
-webkit-border-bottom-right-radius: 0; -webkit-border-bottom-right-radius: 0;
-moz-border-radius-bottomleft : 0; -moz-border-radius-bottomleft : 0;
@ -341,16 +365,15 @@
.chzn-rtl { direction:rtl;text-align: right; } .chzn-rtl { direction:rtl;text-align: right; }
.chzn-rtl .chzn-single { padding-left: 0; padding-right: 8px; } .chzn-rtl .chzn-single { padding-left: 0; padding-right: 8px; }
.chzn-rtl .chzn-single span { margin-left: 26px; margin-right: 0; } .chzn-rtl .chzn-single span { margin-left: 26px; margin-right: 0; }
.chzn-rtl .chzn-single div {
left: 0; right: auto; .chzn-rtl .chzn-single div { left: 3px; right: auto; }
border-left: none; border-right: 1px solid #aaaaaa; .chzn-rtl .chzn-single abbr {
-webkit-border-radius: 4px 0 0 4px; left: 26px;
-moz-border-radius : 4px 0 0 4px; right: auto;
border-radius : 4px 0 0 4px;
} }
.chzn-rtl .chzn-choices li { float: right; } .chzn-rtl .chzn-choices li { float: right; }
.chzn-rtl .chzn-choices .search-choice { padding: 3px 6px 3px 19px; margin: 3px 5px 3px 0; } .chzn-rtl .chzn-choices .search-choice { padding: 3px 5px 3px 19px; margin: 3px 5px 3px 0; }
.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 5px; right: auto; background-position: right top;} .chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 4px; right: auto; background-position: right top;}
.chzn-rtl.chzn-container-single .chzn-results { margin-left: 4px; margin-right: 0; padding-left: 0; padding-right: 4px; } .chzn-rtl.chzn-container-single .chzn-results { margin-left: 4px; margin-right: 0; padding-left: 0; padding-right: 4px; }
.chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; } .chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; }
.chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; } .chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }

35
chosen/chosen.jquery.js
View file

@ -1,7 +1,7 @@
// Chosen, a Select Box Enhancer for jQuery and Protoype // Chosen, a Select Box Enhancer for jQuery and Protoype
// by Patrick Filler for Harvest, http://getharvest.com // by Patrick Filler for Harvest, http://getharvest.com
// //
// Version 0.9.5 // Version 0.9.6
// Full source at https://github.com/harvesthq/chosen // Full source at https://github.com/harvesthq/chosen
// Copyright (c) 2011 Harvest http://getharvest.com // Copyright (c) 2011 Harvest http://getharvest.com
@ -113,7 +113,7 @@
this.results_showing = false; this.results_showing = false;
this.result_highlighted = null; this.result_highlighted = null;
this.result_single_selected = null; this.result_single_selected = null;
this.allow_single_deselect = (this.options.allow_single_deselect != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false; this.allow_single_deselect = (this.options.allow_single_deselect != null) && (this.form_field.options[0] != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false;
this.disable_search_threshold = this.options.disable_search_threshold || 0; this.disable_search_threshold = this.options.disable_search_threshold || 0;
this.choices = 0; this.choices = 0;
return this.results_none_found = this.options.no_results_text || "No results match"; return this.results_none_found = this.options.no_results_text || "No results match";
@ -199,9 +199,9 @@
break; break;
case 27: case 27:
if (this.results_showing) { if (this.results_showing) {
return this.results_hide(); this.results_hide();
} }
break; return true;
case 9: case 9:
case 38: case 38:
case 40: case 40:
@ -357,6 +357,10 @@
return this.search_field.focus(__bind(function(evt) { return this.search_field.focus(__bind(function(evt) {
return this.input_focus(evt); return this.input_focus(evt);
}, this)); }, this));
} else {
return this.container.click(__bind(function(evt) {
return evt.preventDefault();
}, this));
} }
}; };
Chosen.prototype.search_field_disabled = function() { Chosen.prototype.search_field_disabled = function() {
@ -390,7 +394,7 @@
} }
$(document).click(this.click_test_action); $(document).click(this.click_test_action);
this.results_show(); this.results_show();
} else if (!this.is_multiple && evt && ($(evt.target) === this.selected_item || $(evt.target).parents("a.chzn-single").length)) { } else if (!this.is_multiple && evt && (($(evt.target)[0] === this.selected_item[0]) || $(evt.target).parents("a.chzn-single").length)) {
evt.preventDefault(); evt.preventDefault();
this.results_toggle(); this.results_toggle();
} }
@ -442,8 +446,7 @@
} }
}; };
Chosen.prototype.results_build = function() { Chosen.prototype.results_build = function() {
var content, data, startTime, _i, _len, _ref; var content, data, _i, _len, _ref;
startTime = new Date();
this.parsing = true; this.parsing = true;
this.results_data = root.SelectParser.select_to_array(this.form_field); this.results_data = root.SelectParser.select_to_array(this.form_field);
if (this.is_multiple && this.choices > 0) { if (this.is_multiple && this.choices > 0) {
@ -684,8 +687,7 @@
} }
}; };
Chosen.prototype.winnow_results = function() { Chosen.prototype.winnow_results = function() {
var found, option, part, parts, regex, result_id, results, searchText, startTime, startpos, text, zregex, _i, _j, _len, _len2, _ref; var found, option, part, parts, regex, result, result_id, results, searchText, startpos, text, zregex, _i, _j, _len, _len2, _ref;
startTime = new Date();
this.no_results_clear(); this.no_results_clear();
results = 0; results = 0;
searchText = this.search_field.val() === this.default_text ? "" : $('<div/>').text($.trim(this.search_field.val())).html(); searchText = this.search_field.val() === this.default_text ? "" : $('<div/>').text($.trim(this.search_field.val())).html();
@ -696,10 +698,11 @@
option = _ref[_i]; option = _ref[_i];
if (!option.disabled && !option.empty) { if (!option.disabled && !option.empty) {
if (option.group) { if (option.group) {
$('#' + option.dom_id).hide(); $('#' + option.dom_id).css('display', 'none');
} else if (!(this.is_multiple && option.selected)) { } else if (!(this.is_multiple && option.selected)) {
found = false; found = false;
result_id = option.dom_id; result_id = option.dom_id;
result = $("#" + result_id);
if (regex.test(option.html)) { if (regex.test(option.html)) {
found = true; found = true;
results += 1; results += 1;
@ -723,18 +726,16 @@
} else { } else {
text = option.html; text = option.html;
} }
if ($("#" + result_id).html !== text) { result.html(text);
$("#" + result_id).html(text); this.result_activate(result);
}
this.result_activate($("#" + result_id));
if (option.group_array_index != null) { if (option.group_array_index != null) {
$("#" + this.results_data[option.group_array_index].dom_id).show(); $("#" + this.results_data[option.group_array_index].dom_id).css('display', 'list-item');
} }
} else { } else {
if (this.result_highlight && result_id === this.result_highlight.attr('id')) { if (this.result_highlight && result_id === this.result_highlight.attr('id')) {
this.result_clear_highlight(); this.result_clear_highlight();
} }
this.result_deactivate($("#" + result_id)); this.result_deactivate(result);
} }
} }
} }
@ -753,7 +754,7 @@
for (_i = 0, _len = lis.length; _i < _len; _i++) { for (_i = 0, _len = lis.length; _i < _len; _i++) {
li = lis[_i]; li = lis[_i];
li = $(li); li = $(li);
_results.push(li.hasClass("group-result") ? li.show() : !this.is_multiple || !li.hasClass("result-selected") ? this.result_activate(li) : void 0); _results.push(li.hasClass("group-result") ? li.css('display', 'auto') : !this.is_multiple || !li.hasClass("result-selected") ? this.result_activate(li) : void 0);
} }
return _results; return _results;
}; };