Added isValidating and events #152
Merged
Conversation
This file contains 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
poteto
requested changes
Mar 19, 2017
addon/index.js
Outdated
| @@ -49,7 +53,7 @@ const defaultOptions = { skipValidate: false }; | |||
| export function changeset(obj, validateFn = defaultValidatorFn, validationMap = {}, options = {}) { | |||
| assert('Underlying object for changeset is missing', isPresent(obj)); | |||
|
|
|||
| return EmberObject.extend({ | |||
| return EmberObject.extend(Ember.Evented, { | |||
addon/index.js
Outdated
| isValidating(key) { | ||
| let runningValidations = get(this, RUNNING_VALIDATIONS); | ||
| let ks = emberArray(keys(runningValidations)); | ||
| if(key) { return ks.includes(key); } |
addon/index.js
Outdated
| let runningValidations = get(this, RUNNING_VALIDATIONS); | ||
| let count = get(runningValidations, key) || 0; | ||
|
|
||
| if(value) { |
addon/index.js
Outdated
|
|
||
| if(value) { | ||
| set(runningValidations, key, count + 1); | ||
| }else { |
addon/index.js
Outdated
| if(value) { | ||
| set(runningValidations, key, count + 1); | ||
| }else { | ||
| if(count === 1) { |
|
No problem and thanks for reviewing it. I made those changes and also included in the readme documentation for the events I added. Let me know if there is anything else. |
poteto
approved these changes
Mar 31, 2017
ppegusii
pushed a commit
to aspensquare/ember-changeset
that referenced
this pull request
Apr 4, 2017
* Added isValidating function to changeset * Added beforeValidation and afterValidation events * Updated README.md for isValidating and events * Update README.md * Update index.js
poteto
pushed a commit
that referenced
this pull request
Apr 10, 2017
* Add option to skip validations when setting values (#148) * Add option to skip validations on setting values * Rename option for skipping validation * Change object merge to use pureAssign * Update readme to reflect `skipValidate` option * Update helper to pass along `skipValidate` option * obj.hasOwnProperty(key) => key in obj (#151) obj.hasOwnProerty(key) seems to be returning false for ember data models. key in obj seems to work for me. * [BUG]: clear errors for ember 1.13.13 (#157) * [BUG]: clear errors for ember 1.13.13 * Update index.js * Released v1.2.3 * Added isValidating and events (#152) * Added isValidating function to changeset * Added beforeValidation and afterValidation events * Updated README.md for isValidating and events * Update README.md * Update index.js * Update ember and friends (#165) * update to ember-cli 2.8.0 * update to ember-cli 2.9.0 * update to ember-cli 2.10.1 * update to ember-cli 2.12.1 * remove bower from circle build * update ember-try configuration * remove bower install from circle setup ember-cli removed the bower.json file so running this step causes the tests to fail as it can't find the file. * add ember 1.13 back to try tests * add yarn lock file for yarn support (#164) * allow empty objects (#166)
poteto
pushed a commit
that referenced
this pull request
Jul 26, 2017
* Add option to skip validations when setting values (#148) * Add option to skip validations on setting values * Rename option for skipping validation * Change object merge to use pureAssign * Update readme to reflect `skipValidate` option * Update helper to pass along `skipValidate` option * obj.hasOwnProperty(key) => key in obj (#151) obj.hasOwnProerty(key) seems to be returning false for ember data models. key in obj seems to work for me. * [BUG]: clear errors for ember 1.13.13 (#157) * [BUG]: clear errors for ember 1.13.13 * Update index.js * Released v1.2.3 * Added isValidating and events (#152) * Added isValidating function to changeset * Added beforeValidation and afterValidation events * Updated README.md for isValidating and events * Update README.md * Update index.js * Update ember and friends (#165) * update to ember-cli 2.8.0 * update to ember-cli 2.9.0 * update to ember-cli 2.10.1 * update to ember-cli 2.12.1 * remove bower from circle build * update ember-try configuration * remove bower install from circle setup ember-cli removed the bower.json file so running this step causes the tests to fail as it can't find the file. * add ember 1.13 back to try tests * add yarn lock file for yarn support (#164) * allow empty objects (#166) * Remove changes on set when model is Ember.ProxyObject (#169) `key in obj` does not correctly detect properties that are defined on the underlying object of an `Ember.ProxyObject`. Since this conditional is for deciding whether or not to delete a change, I think it makes sense to check the `changes` object for its existence anyway. * Restore ember-cli-release (#184) * Released v1.3.0 * Remove jQuery and test without it (#185)
steverhoades
pushed a commit
to steverhoades/ember-changeset
that referenced
this pull request
Oct 6, 2017
* Add option to skip validations when setting values (adopted-ember-addons#148) * Add option to skip validations on setting values * Rename option for skipping validation * Change object merge to use pureAssign * Update readme to reflect `skipValidate` option * Update helper to pass along `skipValidate` option * obj.hasOwnProperty(key) => key in obj (adopted-ember-addons#151) obj.hasOwnProerty(key) seems to be returning false for ember data models. key in obj seems to work for me. * [BUG]: clear errors for ember 1.13.13 (adopted-ember-addons#157) * [BUG]: clear errors for ember 1.13.13 * Update index.js * Released v1.2.3 * Added isValidating and events (adopted-ember-addons#152) * Added isValidating function to changeset * Added beforeValidation and afterValidation events * Updated README.md for isValidating and events * Update README.md * Update index.js * Update ember and friends (adopted-ember-addons#165) * update to ember-cli 2.8.0 * update to ember-cli 2.9.0 * update to ember-cli 2.10.1 * update to ember-cli 2.12.1 * remove bower from circle build * update ember-try configuration * remove bower install from circle setup ember-cli removed the bower.json file so running this step causes the tests to fail as it can't find the file. * add ember 1.13 back to try tests * add yarn lock file for yarn support (adopted-ember-addons#164) * allow empty objects (adopted-ember-addons#166)
steverhoades
pushed a commit
to steverhoades/ember-changeset
that referenced
this pull request
Oct 6, 2017
…#192) * Add option to skip validations when setting values (adopted-ember-addons#148) * Add option to skip validations on setting values * Rename option for skipping validation * Change object merge to use pureAssign * Update readme to reflect `skipValidate` option * Update helper to pass along `skipValidate` option * obj.hasOwnProperty(key) => key in obj (adopted-ember-addons#151) obj.hasOwnProerty(key) seems to be returning false for ember data models. key in obj seems to work for me. * [BUG]: clear errors for ember 1.13.13 (adopted-ember-addons#157) * [BUG]: clear errors for ember 1.13.13 * Update index.js * Released v1.2.3 * Added isValidating and events (adopted-ember-addons#152) * Added isValidating function to changeset * Added beforeValidation and afterValidation events * Updated README.md for isValidating and events * Update README.md * Update index.js * Update ember and friends (adopted-ember-addons#165) * update to ember-cli 2.8.0 * update to ember-cli 2.9.0 * update to ember-cli 2.10.1 * update to ember-cli 2.12.1 * remove bower from circle build * update ember-try configuration * remove bower install from circle setup ember-cli removed the bower.json file so running this step causes the tests to fail as it can't find the file. * add ember 1.13 back to try tests * add yarn lock file for yarn support (adopted-ember-addons#164) * allow empty objects (adopted-ember-addons#166) * Remove changes on set when model is Ember.ProxyObject (adopted-ember-addons#169) `key in obj` does not correctly detect properties that are defined on the underlying object of an `Ember.ProxyObject`. Since this conditional is for deciding whether or not to delete a change, I think it makes sense to check the `changes` object for its existence anyway. * Restore ember-cli-release (adopted-ember-addons#184) * Released v1.3.0 * Remove jQuery and test without it (adopted-ember-addons#185)
steverhoades
pushed a commit
to steverhoades/ember-changeset
that referenced
this pull request
Oct 6, 2017
* Add option to skip validations when setting values (adopted-ember-addons#148) * Add option to skip validations on setting values * Rename option for skipping validation * Change object merge to use pureAssign * Update readme to reflect `skipValidate` option * Update helper to pass along `skipValidate` option * obj.hasOwnProperty(key) => key in obj (adopted-ember-addons#151) obj.hasOwnProerty(key) seems to be returning false for ember data models. key in obj seems to work for me. * [BUG]: clear errors for ember 1.13.13 (adopted-ember-addons#157) * [BUG]: clear errors for ember 1.13.13 * Update index.js * Released v1.2.3 * Added isValidating and events (adopted-ember-addons#152) * Added isValidating function to changeset * Added beforeValidation and afterValidation events * Updated README.md for isValidating and events * Update README.md * Update index.js * Update ember and friends (adopted-ember-addons#165) * update to ember-cli 2.8.0 * update to ember-cli 2.9.0 * update to ember-cli 2.10.1 * update to ember-cli 2.12.1 * remove bower from circle build * update ember-try configuration * remove bower install from circle setup ember-cli removed the bower.json file so running this step causes the tests to fail as it can't find the file. * add ember 1.13 back to try tests * add yarn lock file for yarn support (adopted-ember-addons#164) * allow empty objects (adopted-ember-addons#166)
steverhoades
pushed a commit
to steverhoades/ember-changeset
that referenced
this pull request
Oct 6, 2017
…#192) * Add option to skip validations when setting values (adopted-ember-addons#148) * Add option to skip validations on setting values * Rename option for skipping validation * Change object merge to use pureAssign * Update readme to reflect `skipValidate` option * Update helper to pass along `skipValidate` option * obj.hasOwnProperty(key) => key in obj (adopted-ember-addons#151) obj.hasOwnProerty(key) seems to be returning false for ember data models. key in obj seems to work for me. * [BUG]: clear errors for ember 1.13.13 (adopted-ember-addons#157) * [BUG]: clear errors for ember 1.13.13 * Update index.js * Released v1.2.3 * Added isValidating and events (adopted-ember-addons#152) * Added isValidating function to changeset * Added beforeValidation and afterValidation events * Updated README.md for isValidating and events * Update README.md * Update index.js * Update ember and friends (adopted-ember-addons#165) * update to ember-cli 2.8.0 * update to ember-cli 2.9.0 * update to ember-cli 2.10.1 * update to ember-cli 2.12.1 * remove bower from circle build * update ember-try configuration * remove bower install from circle setup ember-cli removed the bower.json file so running this step causes the tests to fail as it can't find the file. * add ember 1.13 back to try tests * add yarn lock file for yarn support (adopted-ember-addons#164) * allow empty objects (adopted-ember-addons#166) * Remove changes on set when model is Ember.ProxyObject (adopted-ember-addons#169) `key in obj` does not correctly detect properties that are defined on the underlying object of an `Ember.ProxyObject`. Since this conditional is for deciding whether or not to delete a change, I think it makes sense to check the `changes` object for its existence anyway. * Restore ember-cli-release (adopted-ember-addons#184) * Released v1.3.0 * Remove jQuery and test without it (adopted-ember-addons#185)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Added a function named isValidating to changeset.
Added events beforeValidation and afterValidation.