Skip to content
This repository was archived by the owner on Feb 22, 2018. It is now read-only.

Commit 085461d

Browse files
matskomhevery
matsko
authored and
mhevery
committed
chore(NgModelValidators): add ng- prefix to all validator classes
1 parent 6659f8e commit 085461d

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎lib/directive/ng_model_validators.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ abstract class NgValidator {
1616
class NgModelRequiredValidator implements NgValidator {
1717
bool _required = true;
1818

19-
final String name = 'required';
19+
final String name = 'ng-required';
2020

2121
NgModelRequiredValidator(NgModel ngModel) {
2222
ngModel.addValidator(this);
@@ -47,7 +47,7 @@ class NgModelUrlValidator implements NgValidator {
4747
r'^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?' +
4848
r'(\/|\/([\w#!:.?+=&%@!\-\/]))?$');
4949

50-
final String name = 'url';
50+
final String name = 'ng-url';
5151

5252
NgModelUrlValidator(NgModel ngModel) {
5353
ngModel.addValidator(this);
@@ -65,7 +65,7 @@ class NgModelEmailValidator implements NgValidator {
6565
static final EMAIL_REGEXP = new RegExp(
6666
r'^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}$');
6767

68-
final String name = 'email';
68+
final String name = 'ng-email';
6969

7070
NgModelEmailValidator(NgModel ngModel) {
7171
ngModel.addValidator(this);
@@ -81,7 +81,7 @@ class NgModelEmailValidator implements NgValidator {
8181
@NgDirective(selector: 'input[type=number][ng-model]')
8282
@NgDirective(selector: 'input[type=range][ng-model]')
8383
class NgModelNumberValidator implements NgValidator {
84-
final String name = 'number';
84+
final String name = 'ng-number';
8585

8686
NgModelNumberValidator(NgModel ngModel) {
8787
ngModel.addValidator(this);
@@ -116,7 +116,7 @@ class NgModelNumberValidator implements NgValidator {
116116
class NgModelMaxNumberValidator implements NgValidator {
117117

118118
double _max;
119-
final String name = 'max';
119+
final String name = 'ng-max';
120120

121121
NgModelMaxNumberValidator(NgModel ngModel) {
122122
ngModel.addValidator(this);
@@ -162,7 +162,7 @@ class NgModelMaxNumberValidator implements NgValidator {
162162
class NgModelMinNumberValidator implements NgValidator {
163163

164164
double _min;
165-
final String name = 'min';
165+
final String name = 'ng-min';
166166

167167
NgModelMinNumberValidator(NgModel ngModel) {
168168
ngModel.addValidator(this);
@@ -205,7 +205,7 @@ class NgModelMinNumberValidator implements NgValidator {
205205
class NgModelPatternValidator implements NgValidator {
206206
RegExp _pattern;
207207

208-
final String name = 'pattern';
208+
final String name = 'ng-pattern';
209209

210210
NgModelPatternValidator(NgModel ngModel) {
211211
ngModel.addValidator(this);
@@ -234,7 +234,7 @@ class NgModelPatternValidator implements NgValidator {
234234
class NgModelMinLengthValidator implements NgValidator {
235235
int _minlength;
236236

237-
final String name = 'minlength';
237+
final String name = 'ng-minlength';
238238

239239
NgModelMinLengthValidator(NgModel ngModel) {
240240
ngModel.addValidator(this);
@@ -263,7 +263,7 @@ class NgModelMinLengthValidator implements NgValidator {
263263
class NgModelMaxLengthValidator implements NgValidator {
264264
int _maxlength = 0;
265265

266-
final String name = 'maxlength';
266+
final String name = 'ng-maxlength';
267267

268268
NgModelMaxLengthValidator(NgModel ngModel) {
269269
ngModel.addValidator(this);

‎test/directive/ng_model_validators_spec.dart‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void main() {
193193
model.validate();
194194
expect(model.valid).toEqual(true);
195195
expect(model.invalid).toEqual(false);
196-
expect(model.hasError('max')).toBe(false);
196+
expect(model.hasError('ng-max')).toBe(false);
197197

198198
_.rootScope.apply(() {
199199
_.rootScope.context['val'] = "99";
@@ -202,7 +202,7 @@ void main() {
202202
model.validate();
203203
expect(model.valid).toEqual(false);
204204
expect(model.invalid).toEqual(true);
205-
expect(model.hasError('max')).toBe(true);
205+
expect(model.hasError('ng-max')).toBe(true);
206206

207207
_.rootScope.apply(() {
208208
_.rootScope.context['val'] = "a";
@@ -211,8 +211,8 @@ void main() {
211211
model.validate();
212212
expect(model.valid).toEqual(false);
213213
expect(model.invalid).toEqual(true);
214-
expect(model.hasError('max')).toBe(false);
215-
expect(model.hasError('number')).toBe(true);
214+
expect(model.hasError('ng-max')).toBe(false);
215+
expect(model.hasError('ng-number')).toBe(true);
216216
});
217217

218218
they('should perform a max number validation if a ng-max attribute value is present and/or changed',
@@ -227,7 +227,7 @@ void main() {
227227
model.validate();
228228
expect(model.valid).toEqual(true);
229229
expect(model.invalid).toEqual(false);
230-
expect(model.hasError('max')).toBe(false);
230+
expect(model.hasError('ng-max')).toBe(false);
231231

232232
_.rootScope.apply(() {
233233
_.rootScope.context['val'] = "20";
@@ -236,7 +236,7 @@ void main() {
236236
model.validate();
237237
expect(model.valid).toEqual(true);
238238
expect(model.invalid).toEqual(false);
239-
expect(model.hasError('max')).toBe(false);
239+
expect(model.hasError('ng-max')).toBe(false);
240240

241241
_.rootScope.apply(() {
242242
_.rootScope.context['maxVal'] = "19";
@@ -245,7 +245,7 @@ void main() {
245245
model.validate();
246246
expect(model.valid).toEqual(false);
247247
expect(model.invalid).toEqual(true);
248-
expect(model.hasError('max')).toBe(true);
248+
expect(model.hasError('ng-max')).toBe(true);
249249

250250
_.rootScope.apply(() {
251251
_.rootScope.context['maxVal'] = "22";
@@ -254,7 +254,7 @@ void main() {
254254
model.validate();
255255
expect(model.valid).toEqual(true);
256256
expect(model.invalid).toEqual(false);
257-
expect(model.hasError('max')).toBe(false);
257+
expect(model.hasError('ng-max')).toBe(false);
258258
});
259259

260260
they('should perform a min number validation if a min attribute value is present',
@@ -272,7 +272,7 @@ void main() {
272272
model.validate();
273273
expect(model.valid).toEqual(true);
274274
expect(model.invalid).toEqual(false);
275-
expect(model.hasError('min')).toBe(false);
275+
expect(model.hasError('ng-min')).toBe(false);
276276

277277
_.rootScope.apply(() {
278278
_.rootScope.context['val'] = "-20";
@@ -281,7 +281,7 @@ void main() {
281281
model.validate();
282282
expect(model.valid).toEqual(false);
283283
expect(model.invalid).toEqual(true);
284-
expect(model.hasError('min')).toBe(true);
284+
expect(model.hasError('ng-min')).toBe(true);
285285

286286
_.rootScope.apply(() {
287287
_.rootScope.context['val'] = "x";
@@ -290,8 +290,8 @@ void main() {
290290
model.validate();
291291
expect(model.valid).toEqual(false);
292292
expect(model.invalid).toEqual(true);
293-
expect(model.hasError('min')).toBe(false);
294-
expect(model.hasError('number')).toBe(true);
293+
expect(model.hasError('ng-min')).toBe(false);
294+
expect(model.hasError('ng-number')).toBe(true);
295295
});
296296

297297
they('should perform a min number validation if a ng-min attribute value is present and/or changed',
@@ -306,7 +306,7 @@ void main() {
306306
model.validate();
307307
expect(model.valid).toEqual(true);
308308
expect(model.invalid).toEqual(false);
309-
expect(model.hasError('min')).toBe(false);
309+
expect(model.hasError('ng-min')).toBe(false);
310310

311311
_.rootScope.apply(() {
312312
_.rootScope.context['val'] = "5";
@@ -315,7 +315,7 @@ void main() {
315315
model.validate();
316316
expect(model.valid).toEqual(true);
317317
expect(model.invalid).toEqual(false);
318-
expect(model.hasError('min')).toBe(false);
318+
expect(model.hasError('ng-min')).toBe(false);
319319

320320
_.rootScope.apply(() {
321321
_.rootScope.context['minVal'] = "5.5";
@@ -324,7 +324,7 @@ void main() {
324324
model.validate();
325325
expect(model.valid).toEqual(false);
326326
expect(model.invalid).toEqual(true);
327-
expect(model.hasError('min')).toBe(true);
327+
expect(model.hasError('ng-min')).toBe(true);
328328

329329
_.rootScope.apply(() {
330330
_.rootScope.context['val'] = "5.6";
@@ -333,7 +333,7 @@ void main() {
333333
model.validate();
334334
expect(model.valid).toEqual(true);
335335
expect(model.invalid).toEqual(false);
336-
expect(model.hasError('min')).toBe(false);
336+
expect(model.hasError('ng-min')).toBe(false);
337337
});
338338
});
339339

0 commit comments

Comments
 (0)