This repository was archived by the owner on Feb 22, 2018. It is now read-only.
feat(ng-model-options) Added ng-model-options #974
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,10 +43,9 @@ class NgModel extends NgControl implements AttachAware { | |
| Watch _watch; | ||
| bool _watchCollection; | ||
|
|
||
| NgModel(this._scope, NgElement element, Injector injector, NodeAttrs attrs, | ||
| Animate animate) | ||
| : super(element, injector, animate) { | ||
|
|
||
| _expression = attrs["ng-model"]; | ||
| watchCollection = false; | ||
|
|
||
|
|
@@ -145,11 +144,10 @@ class NgModel extends NgControl implements AttachAware { | |
| if (_watch!=null) _watch.remove(); | ||
| if (_watchCollection) { | ||
| _watch = _scope.watch(_expression, (changeRecord, _) { | ||
| onChange(changeRecord is CollectionChangeRecord | ||
| ? changeRecord.iterable | ||
| : changeRecord); | ||
| }, collection: true); | ||
| } else if (_expression != null) { | ||
| _watch = _scope.watch(_expression, onChange); | ||
| } | ||
|
|
@@ -196,6 +194,7 @@ class NgModel extends NgControl implements AttachAware { | |
|
|
||
| get viewValue => _viewValue; | ||
| void set viewValue(value) { | ||
| //delay set | ||
| _viewValue = value; | ||
| modelValue = value; | ||
| } | ||
|
|
@@ -204,7 +203,7 @@ class NgModel extends NgControl implements AttachAware { | |
| void set modelValue(value) { | ||
| try { | ||
| value = converter.parse(value); | ||
| } catch (e) { | ||
| value = null; | ||
| } | ||
| _modelValue = value; | ||
|
|
@@ -294,26 +293,28 @@ class InputCheckbox { | |
| final NgModel ngModel; | ||
| final NgTrueValue ngTrueValue; | ||
| final NgFalseValue ngFalseValue; | ||
| final NgModelOptions ngModelOptions; | ||
| final Scope scope; | ||
|
|
||
| InputCheckbox(dom.Element this.inputElement, this.ngModel, this.scope, this.ngTrueValue, this.ngFalseValue, this.ngModelOptions) { | ||
|
|
||
| ngModel.render = (value) { | ||
| scope.rootScope.domWrite(() { | ||
| inputElement.checked = ngTrueValue.isValue(value); | ||
| }); | ||
| }; | ||
| inputElement | ||
| ..onChange.listen((_)=>ngModelOptions.executeChangeFunc(() { | ||
|
There was a problem hiding this comment. Should be |
||
| ngModel.viewValue = inputElement.checked ? ngTrueValue.value : ngFalseValue.value; | ||
| })) | ||
| ..onBlur.listen((_)=>ngModelOptions.executeBlurFunc(() { | ||
| ngModel.markAsTouched(); | ||
| })); | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| /** | ||
| * Usage: | ||
| * | ||
|
|
@@ -336,37 +337,41 @@ class InputCheckbox { | |
| class InputTextLike { | ||
| final dom.Element inputElement; | ||
| final NgModel ngModel; | ||
| final NgModelOptions ngModelOptions; | ||
| final Scope scope; | ||
| String _inputType; | ||
|
|
||
|
|
||
| get typedValue => (inputElement as dynamic).value; | ||
| void set typedValue(value) { | ||
| (inputElement as dynamic).value = (value == null) ? '' : value.toString(); | ||
| } | ||
|
|
||
| InputTextLike(this.inputElement, this.ngModel, this.scope, this.ngModelOptions) { | ||
| ngModel.render = (value) { | ||
| scope.rootScope.domWrite(() { | ||
| if (value == null) value = ''; | ||
|
|
||
| var currentValue = typedValue; | ||
| if (value != currentValue && !(value is num && currentValue is num && value.isNaN && currentValue.isNaN)) { | ||
|
|
||
| typedValue = value; | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| inputElement | ||
| ..onChange.listen((event) => ngModelOptions.executeChangeFunc(() => processValue(event))) | ||
| ..onInput.listen((event) => ngModelOptions.executeInputFunc(() => processValue(event))) | ||
| ..onBlur.listen((_) => ngModelOptions.executeBlurFunc(() => () { | ||
| ngModel.markAsTouched(); | ||
| })); | ||
| } | ||
|
|
||
| void processValue([_]) { | ||
| var value = typedValue; | ||
|
|
||
| if (value != ngModel.viewValue) ngModel.viewValue = value; | ||
|
|
||
| ngModel.validate(); | ||
| } | ||
| } | ||
|
|
@@ -393,6 +398,7 @@ class InputTextLike { | |
| class InputNumberLike { | ||
| final dom.InputElement inputElement; | ||
| final NgModel ngModel; | ||
| final NgModelOptions ngModelOptions; | ||
| final Scope scope; | ||
|
|
||
|
|
||
|
|
@@ -413,21 +419,20 @@ class InputNumberLike { | |
| } | ||
| } | ||
|
|
||
| InputNumberLike(dom.Element this.inputElement, this.ngModel, this.scope, this.ngModelOptions) { | ||
| ngModel.render = (value) { | ||
| scope.rootScope.domWrite(() { | ||
| if (value != typedValue && (value == null || value is num && !value.isNaN)) { | ||
| typedValue = value; | ||
| } | ||
| }); | ||
| }; | ||
| inputElement | ||
| ..onChange.listen((event) => ngModelOptions.executeChangeFunc(() => processValue())) | ||
| ..onInput.listen((event) => ngModelOptions.executeInputFunc(() => processValue())) | ||
| ..onBlur.listen((event) => ngModelOptions.executeBlurFunc(() => () { | ||
| ngModel.markAsTouched(); | ||
| })); | ||
| } | ||
|
|
||
| void processValue() { | ||
|
|
@@ -473,19 +478,20 @@ class NgBindTypeForDateLike { | |
| @NgAttr('ng-bind-type') | ||
| void set idlAttrKind(final String _kind) { | ||
| String kind = _kind == null ? DEFAULT : _kind.toLowerCase(); | ||
| if (!VALID_VALUES.contains(kind)) throw "Unsupported ng-bind-type attribute value '$_kind'; " "it should be one of $VALID_VALUES"; | ||
|
|
||
| _idlAttrKind = kind; | ||
| } | ||
|
|
||
| String get idlAttrKind => _idlAttrKind; | ||
|
|
||
| dynamic get inputTypedValue { | ||
| switch (idlAttrKind) { | ||
| case DATE: | ||
| return inputValueAsDate; | ||
| case NUMBER: | ||
| return inputElement.valueAsNumber; | ||
| default: | ||
| return inputElement.value; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -568,28 +574,21 @@ class NgBindTypeForDateLike { | |
| * dropped. | ||
| */ | ||
|
|
||
| @Decorator(selector: 'input[type=date][ng-model]', module: InputDateLike.moduleFactory) | ||
| @Decorator(selector: 'input[type=time][ng-model]', module: InputDateLike.moduleFactory) | ||
| @Decorator(selector: 'input[type=datetime][ng-model]', module: InputDateLike.moduleFactory) | ||
| @Decorator(selector: 'input[type=datetime-local][ng-model]', module: InputDateLike.moduleFactory) | ||
| @Decorator(selector: 'input[type=month][ng-model]', module: InputDateLike.moduleFactory) | ||
| @Decorator(selector: 'input[type=week][ng-model]', module: InputDateLike.moduleFactory) | ||
| class InputDateLike { | ||
| static Module moduleFactory() => new Module()..factory(NgBindTypeForDateLike, (Injector i) => new NgBindTypeForDateLike(i.get(dom.Element))); | ||
|
|
||
| final dom.InputElement inputElement; | ||
| final NgModel ngModel; | ||
| final NgModelOptions ngModelOptions; | ||
| final Scope scope; | ||
| NgBindTypeForDateLike ngBindType; | ||
|
|
||
| InputDateLike(dom.Element this.inputElement, this.ngModel, this.scope, this.ngBindType, this.ngModelOptions) { | ||
|
|
||
| if (inputElement.type == 'datetime-local') { | ||
| ngBindType.idlAttrKind = NgBindTypeForDateLike.NUMBER; | ||
| } | ||
|
|
@@ -599,11 +598,11 @@ class InputDateLike { | |
| }); | ||
| }; | ||
| inputElement | ||
| ..onChange.listen((event) => ngModelOptions.executeChangeFunc(() => processValue())) | ||
| ..onInput.listen((event) => ngModelOptions.executeInputFunc(() => processValue())) | ||
| ..onBlur.listen((_)=> ngModelOptions.executeBlurFunc(() => () { | ||
| ngModel.markAsTouched(); | ||
| })); | ||
| } | ||
|
|
||
| dynamic get typedValue => ngBindType.inputTypedValue; | ||
|
|
@@ -679,7 +678,9 @@ class NgValue { | |
| NgValue(this.element); | ||
|
|
||
| @NgOneWay('ng-value') | ||
| void set value(val) { | ||
| this._value = val; | ||
| } | ||
| dynamic get value => _value == null ? (element as dynamic).value : _value; | ||
| } | ||
|
|
||
|
|
@@ -741,17 +742,14 @@ class NgFalseValue { | |
| * `009`, `00A`, `00Z`, `010`, and so on using more than 3 characters for the | ||
| * name when the counter overflows. | ||
| */ | ||
| @Decorator(selector: 'input[type=radio][ng-model]', module: NgValue.moduleFactory) | ||
|
|
||
| class InputRadio { | ||
| final dom.RadioButtonInputElement radioButtonElement; | ||
| final NgModel ngModel; | ||
| final NgValue ngValue; | ||
| final Scope scope; | ||
|
|
||
| InputRadio(dom.Element this.radioButtonElement, this.ngModel, this.scope, this.ngValue, NodeAttrs attrs) { | ||
|
|
||
| // If there's no "name" set, we'll set a unique name. This ensures | ||
| // less surprising behavior about which radio buttons are grouped together. | ||
| if (attrs['name'] == '' || attrs['name'] == null) { | ||
|
|
@@ -784,8 +782,8 @@ class InputRadio { | |
| */ | ||
| @Decorator(selector: '[contenteditable][ng-model]') | ||
| class ContentEditable extends InputTextLike { | ||
| ContentEditable(dom.Element inputElement, NgModel ngModel, Scope scope, NgModelOptions modelOptions) | ||
| : super(inputElement, ngModel, scope, modelOptions); | ||
|
|
||
| // The implementation is identical to InputTextLike but use innerHtml instead of value | ||
| String get typedValue => (inputElement as dynamic).innerHtml; | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| part of angular.directive; | ||
|
|
||
| @Decorator(selector: 'input[ng-model-options]') | ||
|
There was a problem hiding this comment. Some doc about the purpose of this class would be great! |
||
| class NgModelOptions { | ||
| int _debounceDefaultValue = 0; | ||
| int _debounceBlurValue = null; | ||
|
There was a problem hiding this comment. is int default value not 0? There was a problem hiding this comment. you don't have to be sorry for asking question ;) in Dart everything default to null (Types are only informative and not taken into account in production code) |
||
| int _debounceChangeValue = null; | ||
| int _debounceInputValue = null; | ||
|
|
||
| static const String _debounceDefaultKey = "default"; | ||
|
There was a problem hiding this comment. please use _UPPER_CASE for const names |
||
| static const String _debounceBlurKey = "blur"; | ||
| static const String _debounceChangeKey = "change"; | ||
| static const String _debounceInputKey = "input"; | ||
|
|
||
| NgModelOptions(NodeAttrs attrs) { | ||
| print("options: " + attrs["ng-model-options"].replaceFirst("debounce", "'debounce'").replaceAll("'", "\"")); | ||
|
|
||
| Map options = convert.JSON.decode(attrs["ng-model-options"].replaceFirst("debounce", "'debounce'").replaceAll("'", "\"")); | ||
|
There was a problem hiding this comment. shouldn't we just have valid JSON as input ? There was a problem hiding this comment. only thing i was trying to achieve to match the angularjs spec There was a problem hiding this comment. actually you should check how this is done in ng_pluralize.dart IMO There was a problem hiding this comment. the comment has been removed: please check ng-pluralize There was a problem hiding this comment. what should i check ng-pluralize for? There was a problem hiding this comment. Some attributes have a JSON format On 04/29/2014 01:21 AM, jrote1 wrote:
|
||
|
|
||
| if (options["debounce"].containsKey(_debounceDefaultKey)) _debounceDefaultValue = options["debounce"][_debounceDefaultKey]; | ||
| if (options["debounce"].containsKey(_debounceBlurKey)) _debounceBlurValue = options["debounce"][_debounceBlurKey]; | ||
|
There was a problem hiding this comment. most ifs are useless (returns null when not in map) |
||
| if (options["debounce"].containsKey(_debounceChangeKey)) _debounceChangeValue = options["debounce"][_debounceChangeKey]; | ||
| if (options["debounce"].containsKey(_debounceInputKey)) _debounceInputValue = options["debounce"][_debounceInputKey]; | ||
| } | ||
|
|
||
| async.Timer _blurTimer; | ||
| void executeBlurFunc(func()) { | ||
| if (_blurTimer != null && !_blurTimer.isActive) _blurTimer.cancel(); | ||
|
|
||
| var delay = _debounceBlurValue == null ? _debounceDefaultValue : _debounceBlurValue; | ||
| _runFuncDebounced(delay, func, (timer)=>_blurTimer = timer); | ||
| } | ||
|
|
||
| async.Timer _changeTimer; | ||
|
There was a problem hiding this comment. pls move properties at the top of the class, before methods |
||
| void executeChangeFunc(func()) { | ||
| if (_changeTimer != null && !_changeTimer.isActive) _changeTimer.cancel(); | ||
|
|
||
| var delay = _debounceChangeValue == null ? _debounceDefaultValue : _debounceChangeValue; | ||
| _runFuncDebounced(delay, func, (timer)=>_changeTimer = timer); | ||
| } | ||
|
|
||
| async.Timer _inputTimer; | ||
| void executeInputFunc(func()) { | ||
| if (_inputTimer != null && _inputTimer.isActive) _inputTimer.cancel(); | ||
|
|
||
| var delay = _debounceInputValue == null ? _debounceDefaultValue : _debounceInputValue; | ||
| _runFuncDebounced(delay, func, (timer) => _inputTimer = timer); | ||
| } | ||
|
|
||
| void _runFuncDebounced(int delay, func(), setTimer(async.Timer timer)){ | ||
|
There was a problem hiding this comment. Maybe the last arg could be the timer. Then you can cancel it here |
||
| if(delay == 0) | ||
| func(); | ||
|
|
||
| else | ||
| setTimer(new async.Timer(new Duration(milliseconds: delay), func)); | ||
|
There was a problem hiding this comment. what about dropping the 3rd args & returning the timer |
||
| } | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extra white space