From 67ba16b47de86c5c804541effd709755beea5ed9 Mon Sep 17 00:00:00 2001 From: Patrick Filler Date: Thu, 28 Jul 2011 12:12:00 -0400 Subject: [PATCH] Update CSS / JS to latest versions. --- .gitignore | 1 + chosen/chosen.css | 6 +----- chosen/chosen.proto.js | 31 ++++++++++++++++--------------- 3 files changed, 18 insertions(+), 20 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..496ee2c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store \ No newline at end of file diff --git a/chosen/chosen.css b/chosen/chosen.css index bf4ce07..ba7d9db 100644 --- a/chosen/chosen.css +++ b/chosen/chosen.css @@ -42,7 +42,7 @@ div.chzn-container div.chzn-drop { -webkit-box-shadow: 0px 4px 5px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0px 4px 5px rgba(0, 0, 0, 0.15); box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15); - z-index: 20; + z-index: 999; } div.chzn-container-single div.chzn-drop { -moz-border-radius: 0 0 4px 4px; @@ -78,7 +78,6 @@ div.chzn-container a.chzn-single { padding: 0px 0px 0px 8px; position: relative; text-decoration: none; - z-index: 19; white-space: nowrap; } div.chzn-container a.chzn-single span { @@ -243,7 +242,6 @@ div.chzn-container ul.chzn-results { position: relative; overflow-x: hidden; overflow-y: auto; - z-index: 20; } div.chzn-container-multi ul.chzn-results { margin: -1px 0 0; @@ -256,7 +254,6 @@ div.chzn-container-multi ul.chzn-results li { div.chzn-container ul.chzn-results li { line-height: 80%; padding: 7px 7px 8px; - z-index: 22; margin: 0; list-style-type: none; } @@ -327,7 +324,6 @@ div.chzn-container-active a.chzn-single-with-drop div b { background-position: -18px 1px; } div.chzn-container-active ul.chzn-choices { - z-index: 21; -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3); box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3); diff --git a/chosen/chosen.proto.js b/chosen/chosen.proto.js index 8058b98..1588041 100644 --- a/chosen/chosen.proto.js +++ b/chosen/chosen.proto.js @@ -216,7 +216,7 @@ if (data.selected && this.is_multiple) { this.choice_build(data); } else if (data.selected && !this.is_multiple) { - this.selected_item.down("span").update(data.text); + this.selected_item.down("span").update(data.html); } } } @@ -244,7 +244,7 @@ if (option.group_array_index != null) { classes.push("group-option"); } - return '
  • ' + option.text.escapeHTML() + '
    • '; + return '
  • ' + option.html + '
    • '; } else { return ""; } @@ -365,9 +365,9 @@ this.choices += 1; this.search_container.insert({ before: this.choice_temp.evaluate({ - "id": choice_id, - "choice": item.text, - "position": item.array_index + id: choice_id, + choice: item.html, + position: item.array_index }) }); link = $(choice_id).down('a'); @@ -407,7 +407,7 @@ if (this.is_multiple) { this.choice_build(item); } else { - this.selected_item.down("span").update(item.text); + this.selected_item.down("span").update(item.html); } this.results_hide(); this.search_field.value = ""; @@ -449,7 +449,7 @@ startTime = new Date(); this.no_results_clear(); results = 0; - searchText = this.search_field.value === this.default_text ? "" : this.search_field.value.strip(); + searchText = this.search_field.value === this.default_text ? "" : this.search_field.value.strip().escapeHTML(); regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i'); zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i'); _ref = this.results_data; @@ -461,11 +461,11 @@ } else if (!(this.is_multiple && option.selected)) { found = false; result_id = option.dom_id; - if (regex.test(option.text)) { + if (regex.test(option.html)) { found = true; results += 1; - } else if (option.text.indexOf(" ") >= 0 || option.text.indexOf("[") === 0) { - parts = option.text.replace(/\[|\]/g, "").split(" "); + } else if (option.html.indexOf(" ") >= 0 || option.html.indexOf("[") === 0) { + parts = option.html.replace(/\[|\]/g, "").split(" "); if (parts.length) { for (_j = 0, _len2 = parts.length; _j < _len2; _j++) { part = parts[_j]; @@ -478,11 +478,11 @@ } if (found) { if (searchText.length) { - startpos = option.text.search(zregex); - text = option.text.substr(0, startpos + searchText.length) + '' + option.text.substr(startpos + searchText.length); + startpos = option.html.search(zregex); + text = option.html.substr(0, startpos + searchText.length) + '' + option.html.substr(startpos + searchText.length); text = text.substr(0, startpos) + '' + text.substr(startpos); } else { - text = option.text; + text = option.html; } if ($(result_id).innerHTML !== text) { $(result_id).update(text); @@ -528,7 +528,7 @@ }; Chosen.prototype.no_results = function(terms) { return this.search_results.insert(this.no_results_temp.evaluate({ - "terms": terms.escapeHTML() + terms: terms })); }; Chosen.prototype.no_results_clear = function() { @@ -658,7 +658,7 @@ } div = new Element('div', { 'style': style_block - }).update(this.search_field.value); + }).update(this.search_field.value.escapeHTML()); document.body.appendChild(div); w = Element.measure(div, 'width') + 25; div.remove(); @@ -735,6 +735,7 @@ options_index: this.options_index, value: option.value, text: option.text, + html: option.innerHTML, selected: option.selected, disabled: group_disabled === true ? group_disabled : option.disabled, group_array_index: group_position