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

Fix 'step', 'min' & 'max' controls on date/time inputs #2119

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

Fix 'step', 'min' & 'max' controls on date/time inputs #2119

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a994acb
Fix 'step', 'min' & 'max' controls on date/time inputs
ElGigi Dec 14, 2017
178257b
Fix min and max controls
ElGigi Dec 15, 2017
e7406d0
Fix control on input type "date"
ElGigi Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
130 changes: 111 additions & 19 deletions src/core.js
View file
Open in desktop
Expand Up @@ -1044,6 +1044,27 @@ $.extend( $.validator, {
}
return value.length;
},

getDateValue: function( value, type ) {
switch (type) {
case 'date':
value = value + ' 00:00:00';
case 'datetime':
case 'datetime-local':
value = (new Date(value)).getTime() / 1000;
break;
case 'month':
value = (new Date(value + '-01')).getMonth() + 1;
break;
case 'time':
value = (new Date('2020-01-01 ' + value)).getTime() / 1000;
break;
default:
value = false;
}

return value;
},

depend: function( param, element ) {
return this.dependTypes[ typeof param ] ? this.dependTypes[ typeof param ]( param, element ) : true;
Expand Down Expand Up @@ -1424,12 +1445,76 @@ $.extend( $.validator, {

// https://jqueryvalidation.org/min-method/
min: function( value, element, param ) {
return this.optional( element ) || value >= param;
var valid = true,
type = $( element ).attr( "type" );

switch (type) {
case 'week':
var re = new RegExp("^([0-9]{4})-W([0-9]+)$");
var mVal = re.exec(value),
mParam = re.exec(value);

valid = false;

if (mVal !== null && mParam !== null) {
if (mVal[1] > mParam[1] || (mVal[1] >= mParam[1] && parseInt(mVal[2]) >= parseInt(mParam[2]))) {
valid = true;
}
}
break;
case 'datetime':
case 'datetime-local':
case 'date':
case 'month':
case 'time':
value = this.getDateValue(value, type);
param = this.getDateValue(param, type);
default:
if (value !== false && param !== false) {
valid = value >= param;
} else {
valid = false;
}
}

return this.optional( element ) || valid;
},

// https://jqueryvalidation.org/max-method/
max: function( value, element, param ) {
return this.optional( element ) || value <= param;
var valid = true,
type = $( element ).attr( "type" );

switch (type) {
case 'week':
var re = new RegExp("^([0-9]{4})-W([0-9]+)$");
var mVal = re.exec(value),
mParam = re.exec(value);

valid = false;

if (mVal !== null && mParam !== null) {
if (mVal[1] < mParam[1] || (mVal[1] <= mParam[1] && parseInt(mVal[2]) <= parseInt(mParam[2]))) {
valid = true;
}
}
break;
case 'datetime':
case 'datetime-local':
case 'date':
case 'month':
case 'time':
value = this.getDateValue(value, type);
param = this.getDateValue(param, type);
default:
if (value !== false && param !== false) {
valid = value <= param;
} else {
valid = false;
}
}

return this.optional( element ) || valid;
},

// https://jqueryvalidation.org/range-method/
Expand All @@ -1440,10 +1525,6 @@ $.extend( $.validator, {
// https://jqueryvalidation.org/step-method/
step: function( value, element, param ) {
var type = $( element ).attr( "type" ),
errorMessage = "Step attribute on input type " + type + " is not supported.",
supportedTypes = [ "text", "number", "range" ],
re = new RegExp( "\\b" + type + "\\b" ),
notSupported = type && !re.test( supportedTypes.join() ),
decimalPlaces = function( num ) {
var match = ( "" + num ).match( /(?:\.(\d+))?$/ );
if ( !match ) {
Expand All @@ -1457,19 +1538,30 @@ $.extend( $.validator, {
return Math.round( num * Math.pow( 10, decimals ) );
},
valid = true,
decimals;

// Works only for text, number and range input types
// TODO find a way to support input types date, datetime, datetime-local, month, time and week
if ( notSupported ) {
throw new Error( errorMessage );
}

decimals = decimalPlaces( param );

// Value can't have too many decimals
if ( decimalPlaces( value ) > decimals || toInt( value ) % toInt( param ) !== 0 ) {
valid = false;
decimals = 0;

if (param !== 'any') {
decimals = decimalPlaces(param);

switch (type) {
case 'week':
var re = new RegExp("^[0-9]{4}-W([0-9]+)$");
var m = re.exec(value);

valid = m !== null && toInt(m[1]) % toInt(param) !== 0;
break;
case 'datetime':
case 'datetime-local':
case 'date':
case 'month':
case 'time':
if ((value = this.getDateValue(value, type)) !== false) {
valid = !(toInt(value) % toInt(param) !== 0);
}
break;
default:
valid = !(decimalPlaces(value) > decimals || toInt(value) % toInt(param) !== 0);
}
}

return this.optional( element ) || valid;
Expand Down