Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit b5e00cf

Browse files
jDeppencaitp
authored andcommitted
docs(ngModel): from makes more sense than the other thing
Not sure if this is a worthy change but it confused me when I read it. It is worthy, thank you for submitting this! Cheers! In practice, different from is by far the most common of the three, in both British and American English: http://www.oxforddictionaries.com/us/words/different-from-than-or-to Closes #10710
1 parent 5765061 commit b5e00cf

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/ng/directive/ngModel.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,10 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
285285
* * `$rollbackViewValue()` is called. If we are rolling back the view value to the last
286286
* committed value then `$render()` is called to update the input control.
287287
* * The value referenced by `ng-model` is changed programmatically and both the `$modelValue` and
288-
* the `$viewValue` are different to last time.
288+
* the `$viewValue` are different from last time.
289289
*
290290
* Since `ng-model` does not do a deep watch, `$render()` is only invoked if the values of
291-
* `$modelValue` and `$viewValue` are actually different to their previous value. If `$modelValue`
291+
* `$modelValue` and `$viewValue` are actually different from their previous value. If `$modelValue`
292292
* or `$viewValue` are objects (rather than a string or number) then `$render()` will not be
293293
* invoked if you only change a property on the objects.
294294
*/
@@ -305,7 +305,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
305305
*
306306
* The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
307307
*
308-
* You can override this for input directives whose concept of being empty is different to the
308+
* You can override this for input directives whose concept of being empty is different from the
309309
* default. The `checkboxInputType` directive does this because in its case a value of `false`
310310
* implies empty.
311311
*
@@ -954,7 +954,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
954954
* Sometimes it's helpful to bind `ngModel` to a getter/setter function. A getter/setter is a
955955
* function that returns a representation of the model when called with zero arguments, and sets
956956
* the internal state of a model when called with an argument. It's sometimes useful to use this
957-
* for models that have an internal representation that's different than what the model exposes
957+
* for models that have an internal representation that's different from what the model exposes
958958
* to the view.
959959
*
960960
* <div class="alert alert-success">
@@ -1070,7 +1070,7 @@ var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
10701070
* takes place when a timer expires; this timer will be reset after another change takes place.
10711071
*
10721072
* Given the nature of `ngModelOptions`, the value displayed inside input fields in the view might
1073-
* be different than the value in the actual model. This means that if you update the model you
1073+
* be different from the value in the actual model. This means that if you update the model you
10741074
* should also invoke {@link ngModel.NgModelController `$rollbackViewValue`} on the relevant input field in
10751075
* order to make sure it is synchronized with the model and that any debounced action is canceled.
10761076
*

0 commit comments

Comments
 (0)