diff --git a/media/jui/js/chosen.jquery.js b/media/jui/js/chosen.jquery.js
old mode 100644
new mode 100755
index d72b6becaeca0..060c16284240f
--- a/media/jui/js/chosen.jquery.js
+++ b/media/jui/js/chosen.jquery.js
@@ -1,18 +1,14 @@
-// Chosen, a Select Box Enhancer for jQuery and Prototype
-// by Patrick Filler for Harvest, http://getharvest.com
-//
-// Version 0.14.0
-// Full source at https://github.com/harvesthq/chosen
-// Copyright (c) 2011 Harvest http://getharvest.com
-
-// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
-// This file is generated by `grunt build`, do not edit it by hand.
-
-//
-// Modified for Joomla! UI:
-// - fix zero width, based on https://github.com/harvesthq/chosen/pull/1439
-// - allow to add a custom value on fly, based on https://github.com/harvesthq/chosen/pull/749
-//
+/*!
+Chosen, a Select Box Enhancer for jQuery and Prototype
+by Patrick Filler for Harvest, http://getharvest.com
+
+Version 1.6.2
+Full source at https://github.com/harvesthq/chosen
+Copyright (c) 2011-2016 Harvest http://getharvest.com
+
+MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+This file is generated by `grunt build`, do not edit it by hand.
+*/
(function() {
var $, AbstractChosen, Chosen, SelectParser, _ref,
@@ -35,14 +31,15 @@
SelectParser.prototype.add_group = function(group) {
var group_position, option, _i, _len, _ref, _results;
-
group_position = this.parsed.length;
this.parsed.push({
array_index: group_position,
group: true,
label: this.escapeExpression(group.label),
+ title: group.title ? group.title : void 0,
children: 0,
- disabled: group.disabled
+ disabled: group.disabled,
+ classes: group.className
});
_ref = group.childNodes;
_results = [];
@@ -65,9 +62,11 @@
value: option.value,
text: option.text,
html: option.innerHTML,
+ title: option.title ? option.title : void 0,
selected: option.selected,
disabled: group_disabled === true ? group_disabled : option.disabled,
group_array_index: group_position,
+ group_label: group_position != null ? this.parsed[group_position].label : null,
classes: option.className,
style: option.style.cssText
});
@@ -84,7 +83,6 @@
SelectParser.prototype.escapeExpression = function(text) {
var map, unsafe_chars;
-
if ((text == null) || text === false) {
return "";
}
@@ -110,7 +108,6 @@
SelectParser.select_to_array = function(select) {
var child, parser, _i, _len, _ref;
-
parser = new SelectParser();
_ref = select.childNodes;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -133,12 +130,11 @@
this.setup();
this.set_up_html();
this.register_observers();
- this.finish_setup();
+ this.on_ready();
}
AbstractChosen.prototype.set_default_values = function() {
var _this = this;
-
this.click_test_action = function(evt) {
return _this.test_active_click(evt);
};
@@ -149,11 +145,6 @@
this.mouse_on_container = false;
this.results_showing = false;
this.result_highlighted = null;
- this.result_single_selected = null;
- /**/
- /* Original: not exist */
- this.allow_custom_value = 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 = this.options.disable_search || false;
@@ -164,7 +155,10 @@
this.max_selected_options = this.options.max_selected_options || Infinity;
this.inherit_select_classes = this.options.inherit_select_classes || false;
this.display_selected_options = this.options.display_selected_options != null ? this.options.display_selected_options : true;
- return this.display_disabled_options = this.options.display_disabled_options != null ? this.options.display_disabled_options : true;
+ this.display_disabled_options = this.options.display_disabled_options != null ? this.options.display_disabled_options : true;
+ this.include_group_label_in_selected = this.options.include_group_label_in_selected || false;
+ this.max_shown_results = this.options.max_shown_results || Number.POSITIVE_INFINITY;
+ return this.case_sensitive_search = this.options.case_sensitive_search || false;
};
AbstractChosen.prototype.set_default_text = function() {
@@ -175,13 +169,17 @@
} else {
this.default_text = this.options.placeholder_text_single || this.options.placeholder_text || AbstractChosen.default_single_text;
}
- /**/
- /* Original: not exist */
- this.custom_group_text = this.form_field.getAttribute("data-custom_group_text") || this.options.custom_group_text || "Custom Value";
- /**/
return this.results_none_found = this.form_field.getAttribute("data-no_results_text") || this.options.no_results_text || AbstractChosen.default_no_result_text;
};
+ AbstractChosen.prototype.choice_label = function(item) {
+ if (this.include_group_label_in_selected && (item.group_label != null)) {
+ return "" + item.group_label + "" + item.html;
+ } else {
+ return item.html;
+ }
+ };
+
AbstractChosen.prototype.mouse_enter = function() {
return this.mouse_on_container = true;
};
@@ -192,7 +190,6 @@
AbstractChosen.prototype.input_focus = function(evt) {
var _this = this;
-
if (this.is_multiple) {
if (!this.active_field) {
return setTimeout((function() {
@@ -208,7 +205,6 @@
AbstractChosen.prototype.input_blur = function(evt) {
var _this = this;
-
if (!this.mouse_on_container) {
this.active_field = false;
return setTimeout((function() {
@@ -218,31 +214,38 @@
};
AbstractChosen.prototype.results_option_build = function(options) {
- var content, data, _i, _len, _ref;
-
+ var content, data, data_content, shown_results, _i, _len, _ref;
content = '';
+ shown_results = 0;
_ref = this.results_data;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
data = _ref[_i];
+ data_content = '';
if (data.group) {
- content += this.result_add_group(data);
+ data_content = this.result_add_group(data);
} else {
- content += this.result_add_option(data);
+ data_content = this.result_add_option(data);
+ }
+ if (data_content !== '') {
+ shown_results++;
+ content += data_content;
}
if (options != null ? options.first : void 0) {
if (data.selected && this.is_multiple) {
this.choice_build(data);
} else if (data.selected && !this.is_multiple) {
- this.single_set_selected_text(data.text);
+ this.single_set_selected_text(this.choice_label(data));
}
}
+ if (shown_results >= this.max_shown_results) {
+ break;
+ }
}
return content;
};
AbstractChosen.prototype.result_add_option = function(option) {
- var classes, style;
-
+ var classes, option_el;
if (!option.search_match) {
return '';
}
@@ -265,18 +268,37 @@
if (option.classes !== "") {
classes.push(option.classes);
}
- style = option.style.cssText !== "" ? " style=\"" + option.style + "\"" : "";
- return "
" + option.search_text + "";
+ option_el = document.createElement("li");
+ option_el.className = classes.join(" ");
+ option_el.style.cssText = option.style;
+ option_el.setAttribute("data-option-array-index", option.array_index);
+ option_el.innerHTML = option.search_text;
+ if (option.title) {
+ option_el.title = option.title;
+ }
+ return this.outerHTML(option_el);
};
AbstractChosen.prototype.result_add_group = function(group) {
+ var classes, group_el;
if (!(group.search_match || group.group_match)) {
return '';
}
if (!(group.active_options > 0)) {
return '';
}
- return "" + group.search_text + "";
+ classes = [];
+ classes.push("group-result");
+ if (group.classes) {
+ classes.push(group.classes);
+ }
+ group_el = document.createElement("li");
+ group_el.className = classes.join(" ");
+ group_el.innerHTML = group.search_text;
+ if (group.title) {
+ group_el.title = group.title;
+ }
+ return this.outerHTML(group_el);
};
AbstractChosen.prototype.results_update_field = function() {
@@ -285,13 +307,27 @@
this.results_reset_cleanup();
}
this.result_clear_highlight();
- this.result_single_selected = null;
this.results_build();
if (this.results_showing) {
return this.winnow_results();
}
};
+ AbstractChosen.prototype.reset_single_select_options = function() {
+ var result, _i, _len, _ref, _results;
+ _ref = this.results_data;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ result = _ref[_i];
+ if (result.selected) {
+ _results.push(result.selected = false);
+ } else {
+ _results.push(void 0);
+ }
+ }
+ return _results;
+ };
+
AbstractChosen.prototype.results_toggle = function() {
if (this.results_showing) {
return this.results_hide();
@@ -309,15 +345,13 @@
};
AbstractChosen.prototype.winnow_results = function() {
- var escapedSearchText, option, regex, regexAnchor, results, results_group, searchText, startpos, text, zregex, _i, _len, _ref;
-
+ var escapedSearchText, option, regex, results, results_group, searchText, startpos, text, zregex, _i, _len, _ref;
this.no_results_clear();
results = 0;
searchText = this.get_search_text();
escapedSearchText = searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
- regexAnchor = this.search_contains ? "" : "^";
- regex = new RegExp(regexAnchor + escapedSearchText, 'i');
zregex = new RegExp(escapedSearchText, 'i');
+ regex = this.get_search_regex(escapedSearchText);
_ref = this.results_data;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
option = _ref[_i];
@@ -335,8 +369,8 @@
}
results_group.active_options += 1;
}
+ option.search_text = option.group ? option.label : option.html;
if (!(option.group && !this.group_search)) {
- option.search_text = option.group ? option.label : option.html;
option.search_match = this.search_string_match(option.search_text, regex);
if (option.search_match && !option.group) {
results += 1;
@@ -366,9 +400,15 @@
}
};
+ AbstractChosen.prototype.get_search_regex = function(escaped_search_string) {
+ var regex_anchor, regex_flag;
+ regex_anchor = this.search_contains ? "" : "^";
+ regex_flag = this.case_sensitive_search ? "" : "i";
+ return new RegExp(regex_anchor + escaped_search_string, regex_flag);
+ };
+
AbstractChosen.prototype.search_string_match = function(search_string, regex) {
var part, parts, _i, _len;
-
if (regex.test(search_string)) {
return true;
} else if (this.enable_split_word_search && (search_string.indexOf(" ") >= 0 || search_string.indexOf("[") === 0)) {
@@ -386,7 +426,6 @@
AbstractChosen.prototype.choices_count = function() {
var option, _i, _len, _ref;
-
if (this.selected_option_count != null) {
return this.selected_option_count;
}
@@ -410,7 +449,6 @@
AbstractChosen.prototype.keyup_checker = function(evt) {
var stroke, _ref;
-
stroke = (_ref = evt.which) != null ? _ref : evt.keyCode;
this.search_field_scale();
switch (stroke) {
@@ -439,22 +477,25 @@
case 16:
case 91:
case 17:
+ case 18:
break;
default:
return this.results_search();
}
};
+ AbstractChosen.prototype.clipboard_event_checker = function(evt) {
+ var _this = this;
+ return setTimeout((function() {
+ return _this.results_search();
+ }), 50);
+ };
+
AbstractChosen.prototype.container_width = function() {
if (this.options.width != null) {
return this.options.width;
} else {
- /**/
- /* Original:
return "" + this.form_field.offsetWidth + "px";
- */
- return this.form_field_jq.css("width") || "" + this.form_field.offsetWidth + "px";
- /**/
}
};
@@ -471,18 +512,39 @@
return true;
};
+ AbstractChosen.prototype.search_results_touchstart = function(evt) {
+ this.touch_started = true;
+ return this.search_results_mouseover(evt);
+ };
+
+ AbstractChosen.prototype.search_results_touchmove = function(evt) {
+ this.touch_started = false;
+ return this.search_results_mouseout(evt);
+ };
+
+ AbstractChosen.prototype.search_results_touchend = function(evt) {
+ if (this.touch_started) {
+ return this.search_results_mouseup(evt);
+ }
+ };
+
+ AbstractChosen.prototype.outerHTML = function(element) {
+ var tmp;
+ if (element.outerHTML) {
+ return element.outerHTML;
+ }
+ tmp = document.createElement("div");
+ tmp.appendChild(element);
+ return tmp.innerHTML;
+ };
+
AbstractChosen.browser_is_supported = function() {
- if (window.navigator.appName === "Microsoft Internet Explorer") {
+ if ("Microsoft Internet Explorer" === window.navigator.appName) {
return document.documentMode >= 8;
}
- if (/iP(od|hone)/i.test(window.navigator.userAgent)) {
+ if (/iP(od|hone)/i.test(window.navigator.userAgent) || /IEMobile/i.test(window.navigator.userAgent) || /Windows Phone/i.test(window.navigator.userAgent) || /BlackBerry/i.test(window.navigator.userAgent) || /BB10/i.test(window.navigator.userAgent) || /Android.*Mobile/i.test(window.navigator.userAgent)) {
return false;
}
- if (/Android/i.test(window.navigator.userAgent)) {
- if (/Mobile/i.test(window.navigator.userAgent)) {
- return false;
- }
- }
return true;
};
@@ -505,12 +567,15 @@
}
return this.each(function(input_field) {
var $this, chosen;
-
$this = $(this);
chosen = $this.data('chosen');
- if (options === 'destroy' && chosen) {
- chosen.destroy();
- } else if (!chosen) {
+ if (options === 'destroy') {
+ if (chosen instanceof Chosen) {
+ chosen.destroy();
+ }
+ return;
+ }
+ if (!(chosen instanceof Chosen)) {
$this.data('chosen', new Chosen(this, options));
}
});
@@ -528,27 +593,18 @@
Chosen.prototype.setup = function() {
this.form_field_jq = $(this.form_field);
this.current_selectedIndex = this.form_field.selectedIndex;
- /**/
- /* Original: not exist */
- this.allow_custom_value = this.form_field_jq.hasClass("chzn-custom-value") || this.options.allow_custom_value;
- /**/
- return this.is_rtl = this.form_field_jq.hasClass("chzn-rtl");
- };
-
- Chosen.prototype.finish_setup = function() {
- return this.form_field_jq.addClass("chzn-done");
+ return this.is_rtl = this.form_field_jq.hasClass("chosen-rtl");
};
Chosen.prototype.set_up_html = function() {
var container_classes, container_props;
-
- container_classes = ["chzn-container"];
- container_classes.push("chzn-container-" + (this.is_multiple ? "multi" : "single"));
+ container_classes = ["chosen-container"];
+ container_classes.push("chosen-container-" + (this.is_multiple ? "multi" : "single"));
if (this.inherit_select_classes && this.form_field.className) {
container_classes.push(this.form_field.className);
}
if (this.is_rtl) {
- container_classes.push("chzn-rtl");
+ container_classes.push("chosen-rtl");
}
container_props = {
'class': container_classes.join(' '),
@@ -556,38 +612,48 @@
'title': this.form_field.title
};
if (this.form_field.id.length) {
- container_props.id = this.form_field.id.replace(/[^\w]/g, '_') + "_chzn";
+ container_props.id = this.form_field.id.replace(/[^\w]/g, '_') + "_chosen";
}
this.container = $("", container_props);
if (this.is_multiple) {
- this.container.html('');
+ this.container.html('');
} else {
- this.container.html('' + this.default_text + '
');
+ this.container.html('' + this.default_text + '
');
}
this.form_field_jq.hide().after(this.container);
- this.dropdown = this.container.find('div.chzn-drop').first();
+ this.dropdown = this.container.find('div.chosen-drop').first();
this.search_field = this.container.find('input').first();
- this.search_results = this.container.find('ul.chzn-results').first();
+ this.search_results = this.container.find('ul.chosen-results').first();
this.search_field_scale();
this.search_no_results = this.container.find('li.no-results').first();
if (this.is_multiple) {
- this.search_choices = this.container.find('ul.chzn-choices').first();
+ this.search_choices = this.container.find('ul.chosen-choices').first();
this.search_container = this.container.find('li.search-field').first();
} else {
- this.search_container = this.container.find('div.chzn-search').first();
- this.selected_item = this.container.find('.chzn-single').first();
+ this.search_container = this.container.find('div.chosen-search').first();
+ this.selected_item = this.container.find('.chosen-single').first();
}
this.results_build();
this.set_tab_index();
- this.set_label_behavior();
- return this.form_field_jq.trigger("liszt:ready", {
+ return this.set_label_behavior();
+ };
+
+ Chosen.prototype.on_ready = function() {
+ return this.form_field_jq.trigger("chosen:ready", {
chosen: this
});
};
Chosen.prototype.register_observers = function() {
var _this = this;
-
+ this.container.bind('touchstart.chosen', function(evt) {
+ _this.container_mousedown(evt);
+ return evt.preventDefault();
+ });
+ this.container.bind('touchend.chosen', function(evt) {
+ _this.container_mouseup(evt);
+ return evt.preventDefault();
+ });
this.container.bind('mousedown.chosen', function(evt) {
_this.container_mousedown(evt);
});
@@ -612,15 +678,27 @@
this.search_results.bind('mousewheel.chosen DOMMouseScroll.chosen', function(evt) {
_this.search_results_mousewheel(evt);
});
- this.form_field_jq.bind("liszt:updated.chosen", function(evt) {
+ this.search_results.bind('touchstart.chosen', function(evt) {
+ _this.search_results_touchstart(evt);
+ });
+ this.search_results.bind('touchmove.chosen', function(evt) {
+ _this.search_results_touchmove(evt);
+ });
+ this.search_results.bind('touchend.chosen', function(evt) {
+ _this.search_results_touchend(evt);
+ });
+ this.form_field_jq.bind("chosen:updated.chosen", function(evt) {
_this.results_update_field(evt);
});
- this.form_field_jq.bind("liszt:activate.chosen", function(evt) {
+ this.form_field_jq.bind("chosen:activate.chosen", function(evt) {
_this.activate_field(evt);
});
- this.form_field_jq.bind("liszt:open.chosen", function(evt) {
+ this.form_field_jq.bind("chosen:open.chosen", function(evt) {
_this.container_mousedown(evt);
});
+ this.form_field_jq.bind("chosen:close.chosen", function(evt) {
+ _this.input_blur(evt);
+ });
this.search_field.bind('blur.chosen', function(evt) {
_this.input_blur(evt);
});
@@ -633,6 +711,12 @@
this.search_field.bind('focus.chosen', function(evt) {
_this.input_focus(evt);
});
+ this.search_field.bind('cut.chosen', function(evt) {
+ _this.clipboard_event_checker(evt);
+ });
+ this.search_field.bind('paste.chosen', function(evt) {
+ _this.clipboard_event_checker(evt);
+ });
if (this.is_multiple) {
return this.search_choices.bind('click.chosen', function(evt) {
_this.choices_click(evt);
@@ -645,7 +729,7 @@
};
Chosen.prototype.destroy = function() {
- $(document).unbind("click.chosen", this.click_test_action);
+ $(this.container[0].ownerDocument).unbind("click.chosen", this.click_test_action);
if (this.search_field[0].tabIndex) {
this.form_field_jq[0].tabIndex = this.search_field[0].tabIndex;
}
@@ -657,14 +741,14 @@
Chosen.prototype.search_field_disabled = function() {
this.is_disabled = this.form_field_jq[0].disabled;
if (this.is_disabled) {
- this.container.addClass('chzn-disabled');
+ this.container.addClass('chosen-disabled');
this.search_field[0].disabled = true;
if (!this.is_multiple) {
this.selected_item.unbind("focus.chosen", this.activate_action);
}
return this.close_field();
} else {
- this.container.removeClass('chzn-disabled');
+ this.container.removeClass('chosen-disabled');
this.search_field[0].disabled = false;
if (!this.is_multiple) {
return this.selected_item.bind("focus.chosen", this.activate_action);
@@ -682,9 +766,9 @@
if (this.is_multiple) {
this.search_field.val("");
}
- $(document).bind('click.chosen', this.click_test_action);
+ $(this.container[0].ownerDocument).bind('click.chosen', this.click_test_action);
this.results_show();
- } else if (!this.is_multiple && evt && (($(evt.target)[0] === this.selected_item[0]) || $(evt.target).parents("a.chzn-single").length)) {
+ } else if (!this.is_multiple && evt && (($(evt.target)[0] === this.selected_item[0]) || $(evt.target).parents("a.chosen-single").length)) {
evt.preventDefault();
this.results_toggle();
}
@@ -700,9 +784,10 @@
};
Chosen.prototype.search_results_mousewheel = function(evt) {
- var delta, _ref1, _ref2;
-
- delta = -((_ref1 = evt.originalEvent) != null ? _ref1.wheelDelta : void 0) || ((_ref2 = evt.originialEvent) != null ? _ref2.detail : void 0);
+ var delta;
+ if (evt.originalEvent) {
+ delta = evt.originalEvent.deltaY || -evt.originalEvent.wheelDelta || evt.originalEvent.detail;
+ }
if (delta != null) {
evt.preventDefault();
if (evt.type === 'DOMMouseScroll') {
@@ -713,30 +798,32 @@
};
Chosen.prototype.blur_test = function(evt) {
- if (!this.active_field && this.container.hasClass("chzn-container-active")) {
+ if (!this.active_field && this.container.hasClass("chosen-container-active")) {
return this.close_field();
}
};
Chosen.prototype.close_field = function() {
- $(document).unbind("click.chosen", this.click_test_action);
+ $(this.container[0].ownerDocument).unbind("click.chosen", this.click_test_action);
this.active_field = false;
this.results_hide();
- this.container.removeClass("chzn-container-active");
+ this.container.removeClass("chosen-container-active");
this.clear_backstroke();
this.show_search_field_default();
return this.search_field_scale();
};
Chosen.prototype.activate_field = function() {
- this.container.addClass("chzn-container-active");
+ this.container.addClass("chosen-container-active");
this.active_field = true;
this.search_field.val(this.search_field.val());
return this.search_field.focus();
};
Chosen.prototype.test_active_click = function(evt) {
- if (this.container.is($(evt.target).closest('.chzn-container'))) {
+ var active_container;
+ active_container = $(evt.target).closest('.chosen-container');
+ if (active_container.length && this.container[0] === active_container[0]) {
return this.active_field = true;
} else {
return this.close_field();
@@ -753,10 +840,10 @@
this.single_set_selected_text();
if (this.disable_search || this.form_field.options.length <= this.disable_search_threshold) {
this.search_field[0].readOnly = true;
- this.container.addClass("chzn-container-single-nosearch");
+ this.container.addClass("chosen-container-single-nosearch");
} else {
this.search_field[0].readOnly = false;
- this.container.removeClass("chzn-container-single-nosearch");
+ this.container.removeClass("chosen-container-single-nosearch");
}
}
this.update_results_content(this.results_option_build({
@@ -770,7 +857,6 @@
Chosen.prototype.result_do_highlight = function(el) {
var high_bottom, high_top, maxHeight, visible_bottom, visible_top;
-
if (el.length) {
this.result_clear_highlight();
this.result_highlight = el;
@@ -797,19 +883,19 @@
Chosen.prototype.results_show = function() {
if (this.is_multiple && this.max_selected_options <= this.choices_count()) {
- this.form_field_jq.trigger("liszt:maxselected", {
+ this.form_field_jq.trigger("chosen:maxselected", {
chosen: this
});
return false;
}
- this.container.addClass("chzn-with-drop");
- this.form_field_jq.trigger("liszt:showing_dropdown", {
- chosen: this
- });
+ this.container.addClass("chosen-with-drop");
this.results_showing = true;
this.search_field.focus();
this.search_field.val(this.search_field.val());
- return this.winnow_results();
+ this.winnow_results();
+ return this.form_field_jq.trigger("chosen:showing_dropdown", {
+ chosen: this
+ });
};
Chosen.prototype.update_results_content = function(content) {
@@ -819,8 +905,8 @@
Chosen.prototype.results_hide = function() {
if (this.results_showing) {
this.result_clear_highlight();
- this.container.removeClass("chzn-with-drop");
- this.form_field_jq.trigger("liszt:hiding_dropdown", {
+ this.container.removeClass("chosen-with-drop");
+ this.form_field_jq.trigger("chosen:hiding_dropdown", {
chosen: this
});
}
@@ -829,7 +915,6 @@
Chosen.prototype.set_tab_index = function(el) {
var ti;
-
if (this.form_field.tabIndex) {
ti = this.form_field.tabIndex;
this.form_field.tabIndex = -1;
@@ -839,7 +924,6 @@
Chosen.prototype.set_label_behavior = function() {
var _this = this;
-
this.form_field_label = this.form_field_jq.parents("label");
if (!this.form_field_label.length && this.form_field.id.length) {
this.form_field_label = $("label[for='" + this.form_field.id + "']");
@@ -867,7 +951,6 @@
Chosen.prototype.search_results_mouseup = function(evt) {
var target;
-
target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
if (target.length) {
this.result_highlight = target;
@@ -878,7 +961,6 @@
Chosen.prototype.search_results_mouseover = function(evt) {
var target;
-
target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
if (target) {
return this.result_do_highlight(target);
@@ -894,10 +976,9 @@
Chosen.prototype.choice_build = function(item) {
var choice, close_link,
_this = this;
-
choice = $('', {
"class": "search-choice"
- }).html("" + item.html + "");
+ }).html("" + (this.choice_label(item)) + "");
if (item.disabled) {
choice.addClass('search-choice-disabled');
} else {
@@ -933,8 +1014,8 @@
};
Chosen.prototype.results_reset = function() {
+ this.reset_single_select_options();
this.form_field.options[0].selected = true;
- this.selected_option_count = null;
this.single_set_selected_text();
this.show_search_field_default();
this.results_reset_cleanup();
@@ -950,18 +1031,12 @@
};
Chosen.prototype.result_select = function(evt) {
- /**/
- /* Original:
- var high, item, selected_index;
- */
- var group, high, high_id, item, option, position, value;
- /**/
-
+ var high, item;
if (this.result_highlight) {
high = this.result_highlight;
this.result_clear_highlight();
if (this.is_multiple && this.max_selected_options <= this.choices_count()) {
- this.form_field_jq.trigger("liszt:maxselected", {
+ this.form_field_jq.trigger("chosen:maxselected", {
chosen: this
});
return false;
@@ -969,12 +1044,7 @@
if (this.is_multiple) {
high.removeClass("active-result");
} else {
- if (this.result_single_selected) {
- this.result_single_selected.removeClass("result-selected");
- selected_index = this.result_single_selected[0].getAttribute('data-option-array-index');
- this.results_data[selected_index].selected = false;
- }
- this.result_single_selected = high;
+ this.reset_single_select_options();
}
high.addClass("result-selected");
item = this.results_data[high[0].getAttribute("data-option-array-index")];
@@ -984,77 +1054,38 @@
if (this.is_multiple) {
this.choice_build(item);
} else {
- this.single_set_selected_text(item.text);
+ this.single_set_selected_text(this.choice_label(item));
}
if (!((evt.metaKey || evt.ctrlKey) && this.is_multiple)) {
this.results_hide();
}
- this.search_field.val("");
+ this.show_search_field_default();
if (this.is_multiple || this.form_field.selectedIndex !== this.current_selectedIndex) {
this.form_field_jq.trigger("change", {
'selected': this.form_field.options[item.options_index].value
});
}
this.current_selectedIndex = this.form_field.selectedIndex;
+ evt.preventDefault();
return this.search_field_scale();
}
- /**/
- /* Original: not exist */
- else if ((!this.is_multiple) && this.allow_custom_value) {
- value = this.search_field.val();
- group = this.add_unique_custom_group();
- option = $('');
- group.append(option);
- this.form_field_jq.append(group);
- this.form_field.options[this.form_field.options.length - 1].selected = true;
- if (!evt.metaKey) {
- this.results_hide();
- }
- return this.results_build();
- }
- /**/
- };
-
- /**/
- /* Original: not exist */
- Chosen.prototype.find_custom_group = function() {
- var found, group, _i, _len, _ref;
- _ref = $('optgroup', this.form_field);
- for (_i = 0, _len = _ref.length; _i < _len; _i++) {
- group = _ref[_i];
- if (group.getAttribute('label') === this.custom_group_text) {
- found = group;
- }
- }
- return found;
};
- Chosen.prototype.add_unique_custom_group = function() {
- var group;
- group = this.find_custom_group();
- if (!group) {
- group = $('');
- }
- return $(group);
- };
- /**/
-
Chosen.prototype.single_set_selected_text = function(text) {
if (text == null) {
text = this.default_text;
}
if (text === this.default_text) {
- this.selected_item.addClass("chzn-default");
+ this.selected_item.addClass("chosen-default");
} else {
this.single_deselect_control_build();
- this.selected_item.removeClass("chzn-default");
+ this.selected_item.removeClass("chosen-default");
}
- return this.selected_item.find("span").text(text);
+ return this.selected_item.find("span").html(text);
};
Chosen.prototype.result_deselect = function(pos) {
var result_data;
-
result_data = this.results_data[pos];
if (!this.form_field.options[result_data.options_index].disabled) {
result_data.selected = false;
@@ -1081,20 +1112,15 @@
if (!this.selected_item.find("abbr").length) {
this.selected_item.find("span").first().after("");
}
- return this.selected_item.addClass("chzn-single-with-deselect");
+ return this.selected_item.addClass("chosen-single-with-deselect");
};
Chosen.prototype.get_search_text = function() {
- if (this.search_field.val() === this.default_text) {
- return "";
- } else {
- return $('').text($.trim(this.search_field.val())).html();
- }
+ return $('').text($.trim(this.search_field.val())).html();
};
Chosen.prototype.winnow_results_set_highlight = function() {
var do_high, selected_results;
-
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();
if (do_high != null) {
@@ -1104,10 +1130,12 @@
Chosen.prototype.no_results = function(terms) {
var no_results_html;
-
no_results_html = $('' + this.results_none_found + ' ""');
no_results_html.find("span").first().html(terms);
- return this.search_results.append(no_results_html);
+ this.search_results.append(no_results_html);
+ return this.form_field_jq.trigger("chosen:no_results", {
+ chosen: this
+ });
};
Chosen.prototype.no_results_clear = function() {
@@ -1116,7 +1144,6 @@
Chosen.prototype.keydown_arrow = function() {
var next_sib;
-
if (this.results_showing && this.result_highlight) {
next_sib = this.result_highlight.nextAll("li.active-result").first();
if (next_sib) {
@@ -1129,7 +1156,6 @@
Chosen.prototype.keyup_arrow = function() {
var prev_sibs;
-
if (!this.results_showing && !this.is_multiple) {
return this.results_show();
} else if (this.result_highlight) {
@@ -1147,7 +1173,6 @@
Chosen.prototype.keydown_backstroke = function() {
var next_available_destroy;
-
if (this.pending_backstroke) {
this.choice_destroy(this.pending_backstroke.find("a").first());
return this.clear_backstroke();
@@ -1173,7 +1198,6 @@
Chosen.prototype.keydown_checker = function(evt) {
var stroke, _ref1;
-
stroke = (_ref1 = evt.which) != null ? _ref1 : evt.keyCode;
this.search_field_scale();
if (stroke !== 8 && this.pending_backstroke) {
@@ -1190,7 +1214,14 @@
this.mouse_on_container = false;
break;
case 13:
- evt.preventDefault();
+ if (this.results_showing) {
+ evt.preventDefault();
+ }
+ break;
+ case 32:
+ if (this.disable_search) {
+ evt.preventDefault();
+ }
break;
case 38:
evt.preventDefault();
@@ -1205,7 +1236,6 @@
Chosen.prototype.search_field_scale = function() {
var div, f_width, h, style, style_block, styles, w, _i, _len;
-
if (this.is_multiple) {
h = 0;
w = 0;