Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Object.prototype.hasOwnProperty.call(obj, prop) #96

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Object.prototype.hasOwnProperty.call(obj, prop) #96

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70af344
style:Object.prototype.hasOwnProperty.call
Jun 27, 2022
6ca90b3
Object.prototype.hasOwnProperty.call
Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,11 +320,11 @@ function checkInt(rule, value) {
return this.t('should be an integer');
}

if (rule.hasOwnProperty('max') && value > rule.max) {
if (Object.prototype.hasOwnProperty.call(rule, 'max') && value > rule.max) {
return this.t('should smaller than %s', rule.max);
}

if (rule.hasOwnProperty('min') && value < rule.min) {
if (Object.prototype.hasOwnProperty.call(rule, 'min') && value < rule.min) {
return this.t('should bigger than %s', rule.min);
}
}
Expand All @@ -346,10 +346,10 @@ function checkNumber(rule, value) {
if (typeof value !== 'number' || isNaN(value)) {
return this.t('should be a number');
}
if (rule.hasOwnProperty('max') && value > rule.max) {
if (Object.prototype.hasOwnProperty.call(rule, 'max') && value > rule.max) {
return this.t('should smaller than %s', rule.max);
}
if (rule.hasOwnProperty('min') && value < rule.min) {
if (Object.prototype.hasOwnProperty.call(rule, 'min') && value < rule.min) {
return this.t('should bigger than %s', rule.min);
}
}
Expand All @@ -376,11 +376,11 @@ function checkString(rule, value) {
}

// if required === false, set allowEmpty to true by default
if (!rule.hasOwnProperty('allowEmpty') && rule.required === false) {
if (!Object.prototype.hasOwnProperty.call(rule, 'allowEmpty') && rule.required === false) {
rule.allowEmpty = true;
}

var allowEmpty = rule.hasOwnProperty('allowEmpty')
var allowEmpty = Object.prototype.hasOwnProperty.call(rule, 'allowEmpty')
? rule.allowEmpty
: rule.empty;

Expand All @@ -389,10 +389,10 @@ function checkString(rule, value) {
return this.t('should not be empty');
}

if (rule.hasOwnProperty('max') && value.length > rule.max) {
if (Object.prototype.hasOwnProperty.call(rule, 'max') && value.length > rule.max) {
return this.t('length should smaller than %s', rule.max);
}
if (rule.hasOwnProperty('min') && value.length < rule.min) {
if (Object.prototype.hasOwnProperty.call(rule, 'min') && value.length < rule.min) {
return this.t('length should bigger than %s', rule.min);
}

Expand Down Expand Up @@ -586,10 +586,10 @@ function checkArray(rule, value) {
return this.t('should be an array');
}

if (rule.hasOwnProperty('max') && value.length > rule.max) {
if (Object.prototype.hasOwnProperty.call(rule, 'max') && value.length > rule.max) {
return this.t('length should smaller than %s', rule.max);
}
if (rule.hasOwnProperty('min') && value.length < rule.min) {
if (Object.prototype.hasOwnProperty.call(rule, 'min') && value.length < rule.min) {
return this.t('length should bigger than %s', rule.min);
}

Expand Down