Skip to content

Commit

Permalink
Changes references from '$' to 'jQuery', for compability with jQuery.…
Browse files Browse the repository at this point in the history
…noConflict. Closes gh-754

If you use jQuery.noConflict, this plugin fails to work when using those additional methods.
  • Loading branch information
Andy Cohen authored and jzaefferer committed May 24, 2013
1 parent 01e6251 commit 2049afe
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions additional-methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -544,12 +544,12 @@ jQuery.validator.addMethod("pattern", function(value, element, param) {
jQuery.validator.addMethod("require_from_group", function(value, element, options) {
var validator = this;
var selector = options[1];
var validOrNot = $(selector, element.form).filter(function() {
var validOrNot = jQuery(selector, element.form).filter(function() {
return validator.elementValue(this);
}).length >= options[0];

if(!$(element).data('being_validated')) {
var fields = $(selector, element.form);
var fields = jQuery(selector, element.form);
fields.data('being_validated', true);
fields.valid();
fields.data('being_validated', false);
Expand Down Expand Up @@ -579,12 +579,12 @@ jQuery.validator.addMethod("skip_or_fill_minimum", function(value, element, opti
var validator = this,
numberRequired = options[0],
selector = options[1];
var numberFilled = $(selector, element.form).filter(function() {
var numberFilled = jQuery(selector, element.form).filter(function() {
return validator.elementValue(this);
}).length;
var valid = numberFilled >= numberRequired || numberFilled === 0;

if(!$(element).data('being_validated')) {
if(!jQuery(element).data('being_validated')) {
var fields = $(selector, element.form);
fields.data('being_validated', true);
fields.valid();
Expand All @@ -605,7 +605,7 @@ jQuery.validator.addMethod("accept", function(value, element, param) {
return optionalValue;
}

if ($(element).attr("type") === "file") {
if (jQuery(element).attr("type") === "file") {
// If we are using a wildcard, make it regex friendly
typeParam = typeParam.replace(/\*/g, ".*");

Expand Down

0 comments on commit 2049afe

Please sign in to comment.