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

Commit e5baa50

Browse files
matskomhevery
authored andcommitted
fix(forms): change valid_submit and invalid_submit to camelcase
BREAKING CHANGE: All form code that uses control.valid_submit and control.invalid_submit will throw an error. Instead use control.validSubmit and control.invalidSubmit to check the submission validitity on a control. Closes #793
1 parent c5236ff commit e5baa50

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

lib/directive/ng_control.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
1818
static const NG_SUBMIT_INVALID = "ng-submit-invalid";
1919

2020
String _name;
21-
bool _submit_valid;
21+
bool _submitValid;
2222

2323
final NgControl _parentControl;
2424
final NgAnimate _animate;
@@ -63,10 +63,10 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
6363

6464
void onSubmit(bool valid) {
6565
if (valid) {
66-
_submit_valid = true;
66+
_submitValid = true;
6767
element..addClass(NG_SUBMIT_VALID)..removeClass(NG_SUBMIT_INVALID);
6868
} else {
69-
_submit_valid = false;
69+
_submitValid = false;
7070
element..addClass(NG_SUBMIT_INVALID)..removeClass(NG_SUBMIT_VALID);
7171
}
7272
_controls.forEach((control) {
@@ -79,17 +79,17 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
7979
/**
8080
* Whether or not the form has been submitted yet.
8181
*/
82-
bool get submitted => _submit_valid != null;
82+
bool get submitted => _submitValid != null;
8383

8484
/**
8585
* Whether or not the form was valid when last submitted.
8686
*/
87-
bool get valid_submit => _submit_valid == true;
87+
bool get validSubmit => _submitValid == true;
8888

8989
/**
9090
* Whether or not the form was invalid when last submitted.
9191
*/
92-
bool get invalid_submit => _submit_valid == false;
92+
bool get invalidSubmit => _submitValid == false;
9393

9494
String get name => _name;
9595
set name(value) {
@@ -297,7 +297,7 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
297297
}
298298

299299
class NgNullControl implements NgControl {
300-
var _name, _dirty, _valid, _submit_valid, _pristine, _element, _touched;
300+
var _name, _dirty, _valid, _submitValid, _pristine, _element, _touched;
301301
var _controls, _parentControl, _controlName, _animate, infoStates, errorStates;
302302
var errors, _controlByName;
303303
NgElement element;
@@ -313,8 +313,8 @@ class NgNullControl implements NgControl {
313313
set name(name) {}
314314

315315
bool get submitted => false;
316-
bool get valid_submit => true;
317-
bool get invalid_submit => false;
316+
bool get validSubmit => true;
317+
bool get invalidSubmit => false;
318318
bool get pristine => true;
319319
bool get dirty => false;
320320
bool get valid => true;

test/directive/ng_form_spec.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -522,8 +522,8 @@ void main() {
522522
var formElement = form.element.node;
523523

524524
expect(form.submitted).toBe(false);
525-
expect(form.valid_submit).toBe(false);
526-
expect(form.invalid_submit).toBe(false);
525+
expect(form.validSubmit).toBe(false);
526+
expect(form.invalidSubmit).toBe(false);
527527
expect(formElement.classes.contains('ng-submit-invalid')).toBe(false);
528528
expect(formElement.classes.contains('ng-submit-valid')).toBe(false);
529529

@@ -533,8 +533,8 @@ void main() {
533533
scope.apply();
534534

535535
expect(form.submitted).toBe(true);
536-
expect(form.valid_submit).toBe(false);
537-
expect(form.invalid_submit).toBe(true);
536+
expect(form.validSubmit).toBe(false);
537+
expect(form.invalidSubmit).toBe(true);
538538
expect(formElement.classes.contains('ng-submit-invalid')).toBe(true);
539539
expect(formElement.classes.contains('ng-submit-valid')).toBe(false);
540540

@@ -543,8 +543,8 @@ void main() {
543543
scope.apply();
544544

545545
expect(form.submitted).toBe(true);
546-
expect(form.valid_submit).toBe(true);
547-
expect(form.invalid_submit).toBe(false);
546+
expect(form.validSubmit).toBe(true);
547+
expect(form.invalidSubmit).toBe(false);
548548
expect(formElement.classes.contains('ng-submit-invalid')).toBe(false);
549549
expect(formElement.classes.contains('ng-submit-valid')).toBe(true);
550550
});

0 commit comments

Comments
 (0)