tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 13:19:11 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Removing old remains of NumericField.js validation which was

Browse Source 
removed in 9f3344b355
This commit is contained in:
Sean Harvey 2012-04-11 15:55:07 +12:00
parent 213a08aac7
commit 3e307e00fe
2 changed files with 1 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
forms/NumericField.php
View File

@ -6,18 +6,11 @@
* @subpackage fields-formattedinput * @subpackage fields-formattedinput
*/ */
class NumericField extends TextField{ class NumericField extends TextField{
function Field() {
$html = parent::Field();
Requirements::javascript(SAPPHIRE_DIR . 'javascript/NumericField.js');
return $html;
}
function Type() { function Type() {
return 'numeric text'; return 'numeric text';
} }
/** PHP Validation **/ /** PHP Validation **/
function validate($validator){ function validate($validator){
if($this->value && !is_numeric(trim($this->value))){ if($this->value && !is_numeric(trim($this->value))){

60
javascript/NumericField.js
View File

@ -1,60 +0,0 @@
NumericField = Class.create();
NumericField.applyTo('input.numeric');
NumericField.prototype = {
initialize: function() {
this.oldValue = this.value;
},
setRange: function( minValue, maxValue ) {
this.minValue = minValue;
this.maxValue = maxValue;
},
onkeyup: function() {
var testValue = this.value;
if( testValue == this.oldValue )
return;
var length = this.maxLength;
this.value = '';
var testedOk = true;
var regex = new RegExp( '^\\d{0,' + length + '}$' );
// check that the value is numeric
if( !testValue.match( regex ) )
testedOk = false;
if( testedOk && testValue.length > 0 ) {
// check that the number is not outside the range
if( testedOk && typeof this.minValue != 'undefined' && parseInt(testValue) < this.minValue )
testedOk = false;
if( testedOk && typeof this.maxValue != 'undefined' && parseInt(testValue) > this.maxValue )
testedOk = false;
// use any external tests
if( testedOk && typeof this.externalValidate != 'undefined' && !this.externalValidate( testValue ) )
testedOk = false;
}
if( testedOk ) {
this.oldValue = this.value = testValue;
// DEBUG This produces weird javascript-errors, and is not very useable at all
// DONT MERGE
/*
if( this.value.length == this.maxLength && this.nextField )
this.nextField.focus();
*/
if( this.callOnValidate )
this.callOnValidate();
} else
this.value = this.oldValue;
}
}