This repository was archived by the owner on Apr 12, 2024. It is now read-only.
fix(ngModel): fix issues when parserName is same as validator key #10850
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For $validate(), it is necessary to store the parseError state in the controller. Otherwise, if the parser name equals a validator key, $validate() will assume a parse error occured if the validator is invalid. Also, setting the validity for the parser now happens after setting validity for the validator key. Otherwise, the parse key is set, and then immediately afterwards the validator key is unset (because parse errors remove all other validations). Fixes angular#10698 Closes angular#10850
Narretz
force-pushed
the
fix-parse-validate-clean
branch
from
bd1795e to
5d62a95
Compare
| @@ -518,7 +519,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ | |||
|
|
|||
| // Check if the there's a parse error, so we don't unset it accidentially | |||
| var parserName = ctrl.$$parserName || 'parse'; | |||
There was a problem hiding this comment.
This variable doesn't seem to be used now. What does this mean for the default of 'parse'?
There was a problem hiding this comment.
I see that the errorKey variable sets the default below on line 563
|
I updated the test. I removed the variables that handle the validity of parser / validators. Instead, they now directly react to the input. If you're okay with the test, can we merge this, and push the parseName refactor back? The bug is pretty gnarly and we can fix the parser name later. |
| @@ -1221,6 +1221,96 @@ describe('ngModel', function() { | |||
| expect(ctrl.$validators.mock).toHaveBeenCalledWith('a', 'ab'); | |||
| expect(ctrl.$validators.mock.calls.length).toEqual(2); | |||
| }); | |||
|
|
|||
| iit('should validate correctly when $parser name equals $validator key', function() { | |||
petebacondarwin
pushed a commit
to petebacondarwin/angular.js
that referenced
this pull request
Feb 12, 2015
For $validate(), it is necessary to store the parseError state in the controller. Otherwise, if the parser name equals a validator key, $validate() will assume a parse error occured if the validator is invalid. Also, setting the validity for the parser now happens after setting validity for the validator key. Otherwise, the parse key is set, and then immediately afterwards the validator key is unset (because parse errors remove all other validations). Fixes angular#10698 Closes angular#10850
petebacondarwin
added a commit
that referenced
this pull request
Feb 13, 2015
For $validate(), it is necessary to store the parseError state in the controller. Otherwise, if the parser name equals a validator key, $validate() will assume a parse error occured if the validator is invalid. Also, setting the validity for the parser now happens after setting validity for the validator key. Otherwise, the parse key is set, and then immediately afterwards the validator key is unset (because parse errors remove all other validations). Fixes #10698 Closes #10850 Closes #11046
|
Oh! Sorry @Narretz - when I squashed I attributed it to me instead of you. I am sorry about that - I will not do it again. Great work. |
netman92
pushed a commit
to netman92/angular.js
that referenced
this pull request
Aug 8, 2015
For $validate(), it is necessary to store the parseError state in the controller. Otherwise, if the parser name equals a validator key, $validate() will assume a parse error occured if the validator is invalid. Also, setting the validity for the parser now happens after setting validity for the validator key. Otherwise, the parse key is set, and then immediately afterwards the validator key is unset (because parse errors remove all other validations). Fixes angular#10698 Closes angular#10850 Closes angular#11046
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For $validate(), it is necessary to store the parseError state
in the controller. Otherwise, if the parser name equals a validator
key, $validate() will assume a parse error occured if the validator
is invalid.
Also, setting the validity for the parser now happens after setting
validity for the validator key. Otherwise, the parse key is set,
and then immediately afterwards the validator key is unset
(because parse errors remove all other validations).
Fixes #10698
Closes #10828