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

Merge branch 'fix-old-ie-jquery-check' of https://github.com/greatbigsolutions/chosen into greatbigsolutions-fix-old-ie-jquery-check 

Conflicts:
	chosen/chosen.jquery.js
	chosen/chosen.jquery.min.js
	coffee/chosen.jquery.coffee
js_style_fix
Patrick Filler 2011-10-04 17:29:11 -04:00
parent 4a48fbcd11 4b9a5c68a5
commit f618c69d54
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chosen/chosen.jquery.js
View File

@ -247,7 +247,7 @@
$ = jQuery;
$.fn.extend({
chosen: function(options) {
if ($.browser === "msie" && ($.browser.version === "6.0" || $.browser.version === "7.0")) {
if ($.browser.msie && ($.browser.version === "6.0" || $.browser.version === "7.0")) {
return this;
}
return $(this).each(function(input_field) {

2
chosen/chosen.jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
coffee/chosen.jquery.coffee
View File

@ -7,7 +7,8 @@ $ = jQuery
$.fn.extend({
chosen: (options) ->
return this if $.browser is "msie" and ($.browser.version is "6.0" or $.browser.version is "7.0")
# Do no harm and return as soon as possible for unsupported browsers, namely IE6 and IE7
return this if $.browser.msie and ($.browser.version is "6.0" or $.browser.version is "7.0")
$(this).each((input_field) ->
new Chosen(this, options) unless ($ this).hasClass "chzn-done"
)