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
This commit is contained in:
commit
f618c69d54
3 changed files with 4 additions and 3 deletions
|
@ -247,7 +247,7 @@
|
||||||
$ = jQuery;
|
$ = jQuery;
|
||||||
$.fn.extend({
|
$.fn.extend({
|
||||||
chosen: function(options) {
|
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;
|
||||||
}
|
}
|
||||||
return $(this).each(function(input_field) {
|
return $(this).each(function(input_field) {
|
||||||
|
|
2
chosen/chosen.jquery.min.js
vendored
2
chosen/chosen.jquery.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -7,7 +7,8 @@ $ = jQuery
|
||||||
|
|
||||||
$.fn.extend({
|
$.fn.extend({
|
||||||
chosen: (options) ->
|
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) ->
|
$(this).each((input_field) ->
|
||||||
new Chosen(this, options) unless ($ this).hasClass "chzn-done"
|
new Chosen(this, options) unless ($ this).hasClass "chzn-done"
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue