Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MINOR Removing old remains of NumericField.js validation which was

removed in 9f3344b
  • Loading branch information...
commit 3e307e00fe5fa6777b873b7b12820db9bb666ade 1 parent 213a08a
@halkyon halkyon authored
Showing with 1 addition and 68 deletions.
  1. +1 −8 forms/NumericField.php
  2. +0 −60 javascript/NumericField.js
View
9 forms/NumericField.php
@@ -6,18 +6,11 @@
* @subpackage fields-formattedinput
*/
class NumericField extends TextField{
-
- function Field() {
- $html = parent::Field();
- Requirements::javascript(SAPPHIRE_DIR . 'javascript/NumericField.js');
-
- return $html;
- }
function Type() {
return 'numeric text';
}
-
+
/** PHP Validation **/
function validate($validator){
if($this->value && !is_numeric(trim($this->value))){
View
60 javascript/NumericField.js
@@ -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;
- }
-}
Please sign in to comment.
Something went wrong with that request. Please try again.