@@ -998,60 +998,6 @@ $.extend($.validator, {
998
998
return $ . trim ( value ) . length > 0 ;
999
999
} ,
1000
1000
1001
- // http://docs.jquery.com/Plugins/Validation/Methods/remote
1002
- remote :function ( value , element , param ) {
1003
- if ( this . optional ( element ) ) {
1004
- return "dependency-mismatch" ;
1005
- }
1006
-
1007
- var previous = this . previousValue ( element ) ;
1008
- if ( ! this . settings . messages [ element . name ] ) {
1009
- this . settings . messages [ element . name ] = { } ;
1010
- }
1011
- previous . originalMessage = this . settings . messages [ element . name ] . remote ;
1012
- this . settings . messages [ element . name ] . remote = previous . message ;
1013
-
1014
- param = typeof param === "string" && { url :param } || param ;
1015
-
1016
- if ( previous . old === value ) {
1017
- return previous . valid ;
1018
- }
1019
-
1020
- previous . old = value ;
1021
- var validator = this ;
1022
- this . startRequest ( element ) ;
1023
- var data = { } ;
1024
- data [ element . name ] = value ;
1025
- $ . ajax ( $ . extend ( true , {
1026
- url :param ,
1027
- mode :"abort" ,
1028
- port :"validate" + element . name ,
1029
- dataType :"json" ,
1030
- data :data ,
1031
- success :function ( response ) {
1032
- validator . settings . messages [ element . name ] . remote = previous . originalMessage ;
1033
- var valid = response === true || response === "true" ;
1034
- if ( valid ) {
1035
- var submitted = validator . formSubmitted ;
1036
- validator . prepareElement ( element ) ;
1037
- validator . formSubmitted = submitted ;
1038
- validator . successList . push ( element ) ;
1039
- delete validator . invalid [ element . name ] ;
1040
- validator . showErrors ( ) ;
1041
- } else {
1042
- var errors = { } ;
1043
- var message = response || validator . defaultMessage ( element , "remote" ) ;
1044
- errors [ element . name ] = previous . message = $ . isFunction ( message ) ?message ( value ) :message ;
1045
- validator . invalid [ element . name ] = true ;
1046
- validator . showErrors ( errors ) ;
1047
- }
1048
- previous . valid = valid ;
1049
- validator . stopRequest ( element , valid ) ;
1050
- }
1051
- } , param ) ) ;
1052
- return "pending" ;
1053
- } ,
1054
-
1055
1001
// http://docs.jquery.com/Plugins/Validation/Methods/email
1056
1002
email :function ( value , element ) {
1057
1003
// contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
@@ -1159,6 +1105,60 @@ $.extend($.validator, {
1159
1105
} ) ;
1160
1106
}
1161
1107
return value === target . val ( ) ;
1108
+ } ,
1109
+
1110
+ // http://docs.jquery.com/Plugins/Validation/Methods/remote
1111
+ remote :function ( value , element , param ) {
1112
+ if ( this . optional ( element ) ) {
1113
+ return "dependency-mismatch" ;
1114
+ }
1115
+
1116
+ var previous = this . previousValue ( element ) ;
1117
+ if ( ! this . settings . messages [ element . name ] ) {
1118
+ this . settings . messages [ element . name ] = { } ;
1119
+ }
1120
+ previous . originalMessage = this . settings . messages [ element . name ] . remote ;
1121
+ this . settings . messages [ element . name ] . remote = previous . message ;
1122
+
1123
+ param = typeof param === "string" && { url :param } || param ;
1124
+
1125
+ if ( previous . old === value ) {
1126
+ return previous . valid ;
1127
+ }
1128
+
1129
+ previous . old = value ;
1130
+ var validator = this ;
1131
+ this . startRequest ( element ) ;
1132
+ var data = { } ;
1133
+ data [ element . name ] = value ;
1134
+ $ . ajax ( $ . extend ( true , {
1135
+ url :param ,
1136
+ mode :"abort" ,
1137
+ port :"validate" + element . name ,
1138
+ dataType :"json" ,
1139
+ data :data ,
1140
+ success :function ( response ) {
1141
+ validator . settings . messages [ element . name ] . remote = previous . originalMessage ;
1142
+ var valid = response === true || response === "true" ;
1143
+ if ( valid ) {
1144
+ var submitted = validator . formSubmitted ;
1145
+ validator . prepareElement ( element ) ;
1146
+ validator . formSubmitted = submitted ;
1147
+ validator . successList . push ( element ) ;
1148
+ delete validator . invalid [ element . name ] ;
1149
+ validator . showErrors ( ) ;
1150
+ } else {
1151
+ var errors = { } ;
1152
+ var message = response || validator . defaultMessage ( element , "remote" ) ;
1153
+ errors [ element . name ] = previous . message = $ . isFunction ( message ) ?message ( value ) :message ;
1154
+ validator . invalid [ element . name ] = true ;
1155
+ validator . showErrors ( errors ) ;
1156
+ }
1157
+ previous . valid = valid ;
1158
+ validator . stopRequest ( element , valid ) ;
1159
+ }
1160
+ } , param ) ) ;
1161
+ return "pending" ;
1162
1162
}
1163
1163
1164
1164
}