Commit 33311d45 authored by Chris Hynes's avatar Chris Hynes

Made single selection checking work properly so .val() returns correctly

Removed browser sniffing for IE and use :selected pseudoselector everywhere
parent cd210f94
...@@ -210,9 +210,10 @@ ...@@ -210,9 +210,10 @@
$checkboxesNotThis.filter(function () { return $(this).is(':checked') != checked; }).trigger('click'); $checkboxesNotThis.filter(function () { return $(this).is(':checked') != checked; }).trigger('click');
} }
if (checked) { if (checked) {
option.attr('selected', 'selected').prop('selected', true); option.prop('selected', true);
if (!this.options.multiple) { if (!this.options.multiple)
{
if (this.options.selectedClass) { if (this.options.selectedClass) {
$($checkboxesNotThis).parents('li').removeClass(this.options.selectedClass); $($checkboxesNotThis).parents('li').removeClass(this.options.selectedClass);
} }
...@@ -228,9 +229,10 @@ ...@@ -228,9 +229,10 @@
if (this.options.selectedClass == "active") { if (this.options.selectedClass == "active") {
$optionsNotThis.parents("a").css("outline", ""); $optionsNotThis.parents("a").css("outline", "");
} }
} }
else { else {
option.removeAttr('selected'); option.removeAttr('selected').prop('selected', false);
} }
var options = this.getSelected(); var options = this.getSelected();
...@@ -377,14 +379,14 @@ ...@@ -377,14 +379,14 @@
// For IE 9 support. // For IE 9 support.
getSelected: function() { getSelected: function() {
if (navigator.appName == 'Microsoft Internet Explorer') { //if (navigator.appName == 'Microsoft Internet Explorer') {
var regex = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})"); // var regex = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})");
if (regex.exec(navigator.userAgent) != null) { // if (regex.exec(navigator.userAgent) != null) {
return $('option:selected[value!="select-all-option"]', this.$select); // return $('option:selected[value!="select-all-option"]', this.$select);
} // }
} //}
return $('option[selected][value!="select-all-option"]', this.$select); return $('option:selected[value!="select-all-option"]', this.$select);
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment