@@ -42,7 +42,7 @@ function VC(V)
4242 return V . call ( self , v , k ) || V2 . call ( self , v , k ) ;
4343 } ) ;
4444 } ;
45- V . XOR = function ( V2 ) {
45+ /* V.XOR = function(V2) {
4646 return VC(function(v, k) {
4747 var self = this, r1 = V.call(self, v, k), r2 = V2.call(self, v, k);
4848 return (r1 && !r2) || (r2 && !r1);
@@ -69,7 +69,7 @@ function VC(V)
6969 var self = this, r1 = V.call(self, v, k), r2 = V2.call(self, v, k);
7070 return r1 != r2;
7171 });
72- } ;
72+ };*/
7373 return V ;
7474}
7575
@@ -85,7 +85,7 @@ var Type = {
8585
8686 tpl_$0 : tpl_$0_re ,
8787
88- TypeCaster : function ( typecaster ) { return typecaster ; }
88+ TypeCaster : function ( typecaster ) { return typecaster ; }
8989
9090 // default type casters
9191 , Cast : {
@@ -97,10 +97,10 @@ ModelView.Type.Cast.COMPOSITE( TypeCaster1, TypeCaster2 [, ...] );
9797 // composite type caster
9898 COMPOSITE : function ( ) {
9999 var args = arguments ;
100- if ( is_type ( args [ 0 ] , T_ARRAY ) ) args = args [ 0 ] ;
100+ if ( is_type ( args [ 0 ] , T_ARRAY ) ) args = args [ 0 ] ;
101101 return function ( v , k ) {
102102 var l = args . length ;
103- while ( l -- ) v = args [ l ] . call ( this , v , k ) ;
103+ while ( l -- ) v = args [ l ] . call ( this , v , k ) ;
104104 return v ;
105105 } ;
106106 } ,
@@ -132,18 +132,18 @@ ModelView.Type.Cast.FIELDS({
132132 var self = this , field , type , val ;
133133 for ( field in typesPerField )
134134 {
135- if ( HAS . call ( typesPerField , field ) )
135+ if ( HAS . call ( typesPerField , field ) )
136136 {
137- type = typesPerField [ field ] ; val = v [ field ] ;
137+ type = typesPerField [ field ] ; val = v [ field ] ;
138138 if ( type . fEach && is_type ( val , T_ARRAY ) )
139139 {
140- v [ field ] = iterate ( function ( i , val ) {
141- val [ i ] = type . f . call ( self , val [ i ] ) ;
140+ v [ field ] = iterate ( function ( i , val ) {
141+ val [ i ] = type . f . call ( self , val [ i ] ) ;
142142 } , 0 , val . length - 1 , val ) ;
143143 }
144144 else
145145 {
146- v [ field ] = type . call ( self , val ) ;
146+ v [ field ] = type . call ( self , val ) ;
147147 }
148148 }
149149 }
@@ -158,8 +158,7 @@ ModelView.Type.Cast.DEFAULT( defaultValue );
158158[/DOC_MARKDOWN]**/
159159 DEFAULT : function ( defaultValue ) {
160160 return function ( v ) {
161- var T = get_type ( v ) ;
162- if ( ( T_UNDEF & T ) || ( ( T_STR & T ) && ! trim ( v ) . length ) ) v = defaultValue ;
161+ if ( ( null == v ) || ( is_type ( v , T_STR ) && ! trim ( v ) . length ) ) v = defaultValue ;
163162 return v ;
164163 } ;
165164 } ,
@@ -172,7 +171,7 @@ ModelView.Type.Cast.BOOL;
172171 // handle string representation of booleans as well
173172 if ( is_type ( v , T_STR ) && v . length )
174173 {
175- var vs = v . toLowerCase ( ) ;
174+ var vs = v . toLowerCase ( ) ;
176175 return "true" === vs || "yes" === vs || "on" === vs || "1" === vs ;
177176 }
178177 return ! ! v ;
@@ -218,7 +217,7 @@ ModelView.Type.Cast.CLAMP( min, max );
218217[/DOC_MARKDOWN]**/
219218 CLAMP : function ( m , M ) {
220219 // swap
221- if ( m > M ) { var tmp = M ; M = m ; m = tmp ; }
220+ if ( m > M ) { var tmp = M ; M = m ; m = tmp ; }
222221 return function ( v ) { return v < m ? m : ( v > M ? M : v ) ; } ;
223222 } ,
224223/**[DOC_MARKDOWN]
@@ -314,13 +313,13 @@ ModelView.Validation.Validate.FIELDS({
314313 var self = this , field , validator , val , l , i ;
315314 for ( field in validatorsPerField )
316315 {
317- if ( HAS . call ( validatorsPerField , field ) )
316+ if ( HAS . call ( validatorsPerField , field ) )
318317 {
319- validator = validatorsPerField [ field ] ; val = v [ field ] ;
318+ validator = validatorsPerField [ field ] ; val = v [ field ] ;
320319 if ( validator . fEach && is_type ( val , T_ARRAY ) )
321320 {
322321 l = val . length ;
323- for ( i = 0 ; i < l ; i ++ ) if ( ! validator . f . call ( self , val [ i ] ) ) return false ;
322+ for ( i = 0 ; i < l ; i ++ ) if ( ! validator . f . call ( self , val [ i ] ) ) return false ;
324323 }
325324 else
326325 {
@@ -378,15 +377,15 @@ ModelView.Validation.Validate.MATCH( regex );
378377
379378[/DOC_MARKDOWN]**/
380379 MATCH : function ( regex_pattern ) {
381- return VC ( function ( v ) { return regex_pattern . test ( v ) ; } ) ;
380+ return VC ( function ( v ) { return regex_pattern . test ( v ) ; } ) ;
382381 } ,
383382/**[DOC_MARKDOWN]
384383// validate value not matches regex pattern
385384ModelView.Validation.Validate.NOT_MATCH( regex );
386385
387386[/DOC_MARKDOWN]**/
388387 NOT_MATCH : function ( regex_pattern ) {
389- return VC ( function ( v ) { return ! regex_pattern . test ( v ) ; } ) ;
388+ return VC ( function ( v ) { return ! regex_pattern . test ( v ) ; } ) ;
390389 } ,
391390/**[DOC_MARKDOWN]
392391// validate equal to value (or model field)
@@ -477,7 +476,7 @@ ModelView.Validation.Validate.IN( value1, value2 [, ...] );
477476[/DOC_MARKDOWN]**/
478477 IN : function ( /* vals,.. */ ) {
479478 var vals = slice . call ( arguments ) ;
480- if ( is_type ( vals [ 0 ] , T_ARRAY ) ) vals = vals [ 0 ] ;
479+ if ( is_type ( vals [ 0 ] , T_ARRAY ) ) vals = vals [ 0 ] ;
481480 return VC ( function ( v ) {
482481 return - 1 < vals . indexOf ( v ) ;
483482 } ) ;
@@ -489,7 +488,7 @@ ModelView.Validation.Validate.NOT_IN( value1, value2 [, ...] );
489488[/DOC_MARKDOWN]**/
490489 NOT_IN : function ( /* vals,.. */ ) {
491490 var vals = slice . call ( arguments ) ;
492- if ( is_type ( vals [ 0 ] , T_ARRAY ) ) vals = vals [ 0 ] ;
491+ if ( is_type ( vals [ 0 ] , T_ARRAY ) ) vals = vals [ 0 ] ;
493492 return VC ( function ( v ) {
494493 return 0 > vals . indexOf ( v ) ;
495494 } ) ;
@@ -502,7 +501,7 @@ ModelView.Validation.add( name, validator );
502501[/DOC_MARKDOWN]**/
503502 , add : function ( type , handler ) {
504503 if ( is_type ( type , T_STR ) && is_type ( handler , T_FUNC ) )
505- Validation . Validate [ type ] = is_type ( handler . XOR , T_FUNC ) ? handler : VC ( handler ) ;
504+ Validation . Validate [ type ] = is_type ( handler . XOR , T_FUNC ) ? handler : VC ( handler ) ;
506505 return Validation ;
507506 }
508507
@@ -512,7 +511,7 @@ ModelView.Validation.del( name );
512511
513512[/DOC_MARKDOWN]**/
514513 , del : function ( type ) {
515- if ( is_type ( type , T_STR ) && HAS . call ( Validation . Validate , type ) ) delete Validation . Validate [ type ] ;
514+ if ( is_type ( type , T_STR ) && HAS . call ( Validation . Validate , type ) ) delete Validation . Validate [ type ] ;
516515 return Validation ;
517516 }
518517
0 commit comments