honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ChangeDetector): support for NaN 

Closes #4853
This commit is contained in:
Victor Berchet 2015-10-21 13:49:52 -07:00
parent 758062807a
commit 1316c3e391
8 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/angular2/src/core/change_detection/change_detection_jit_generator.ts
View File

@ -284,7 +284,7 @@ export class ChangeDetectorJITGenerator {
var condition = `!${pipe}.pure || (${contexOrArgCheck.join(" || ")})`;
var check = `
if (${oldValue} !== ${newValue}) {
if (${this.changeDetectionUtilVarName}.looseNotIdentical(${oldValue}, ${newValue})) {
${newValue} = ${this.changeDetectionUtilVarName}.unwrapValue(${newValue})
${this._genChangeMarker(r)}
${this._genUpdateDirectiveOrElement(r)}
@ -311,7 +311,7 @@ export class ChangeDetectorJITGenerator {
`;
var check = `
if (${newValue} !== ${oldValue}) {
if (${this.changeDetectionUtilVarName}.looseNotIdentical(${oldValue}, ${newValue})) {
${this._genChangeMarker(r)}
${this._genUpdateDirectiveOrElement(r)}
${this._genAddToChanges(r)}

11
modules/angular2/src/core/change_detection/change_detection_util.ts
View File

@ -1,4 +1,11 @@
import {CONST_EXPR, isPresent, isBlank, Type, StringWrapper} from 'angular2/src/core/facade/lang';
import {
CONST_EXPR,
isPresent,
isBlank,
Type,
StringWrapper,
looseIdentical
} from 'angular2/src/core/facade/lang';
import {BaseException} from 'angular2/src/core/facade/exceptions';
import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
import {ProtoRecord} from './proto_record';
@ -202,4 +209,6 @@ export class ChangeDetectionUtil {
static directiveIndex(elementIndex: number, directiveIndex: number): DirectiveIndex {
return new DirectiveIndex(elementIndex, directiveIndex);
}
static looseNotIdentical(a: any, b: any): boolean { return !looseIdentical(a, b); }
}

4
modules/angular2/src/core/change_detection/coalesce.ts
View File

@ -1,4 +1,4 @@
import {isPresent, isBlank, looseIdentical} from 'angular2/src/core/facade/lang';
import {isPresent, isBlank, looseIdentical, StringWrapper} from 'angular2/src/core/facade/lang';
import {ListWrapper, Map} from 'angular2/src/core/facade/collection';
import {RecordType, ProtoRecord} from './proto_record';
@ -52,7 +52,7 @@ function _findMatching(r: ProtoRecord, rs: ProtoRecord[]) {
return ListWrapper.find(
rs, (rr) => rr.mode !== RecordType.DirectiveLifecycle && _sameDirIndex(rr, r) &&
rr.mode === r.mode && looseIdentical(rr.funcOrValue, r.funcOrValue) &&
rr.contextIndex === r.contextIndex && looseIdentical(rr.name, r.name) &&
rr.contextIndex === r.contextIndex && StringWrapper.equals(rr.name, r.name) &&
ListWrapper.equals(rr.args, r.args));
}

11
modules/angular2/src/core/change_detection/dynamic_change_detector.ts
View File

@ -245,7 +245,7 @@ export class DynamicChangeDetector extends AbstractChangeDetector<any> {
if (proto.shouldBeChecked()) {
var prevValue = this._readSelf(proto, values);
if (!isSame(prevValue, currValue)) {
if (ChangeDetectionUtil.looseNotIdentical(prevValue, currValue)) {
if (proto.lastInBinding) {
var change = ChangeDetectionUtil.simpleChange(prevValue, currValue);
if (throwOnChange) this.throwOnChangeError(prevValue, currValue);
@ -348,7 +348,7 @@ export class DynamicChangeDetector extends AbstractChangeDetector<any> {
if (proto.shouldBeChecked()) {
var prevValue = this._readSelf(proto, values);
if (!isSame(prevValue, currValue)) {
if (ChangeDetectionUtil.looseNotIdentical(prevValue, currValue)) {
currValue = ChangeDetectionUtil.unwrapValue(currValue);
if (proto.lastInBinding) {
@ -443,10 +443,3 @@ export class DynamicChangeDetector extends AbstractChangeDetector<any> {
return res;
}
}
function isSame(a, b): boolean {
if (a === b) return true;
if (a instanceof String && b instanceof String && a == b) return true;
if ((a !== a) && (b !== b)) return true;
return false;
}

5
modules/angular2/src/core/change_detection/pregen_proto_change_detector.dart
View File

@ -49,8 +49,3 @@ class PregenProtoChangeDetector extends ProtoChangeDetector {
@override
instantiate(dynamic dispatcher) => _instantiateMethod(dispatcher);
}
/// Provided as an optimization to cut down on '!' characters in generated
/// change detectors. See https://github.com/angular/angular/issues/3248 for
/// for details.
bool looseNotIdentical(a, b) => !looseIdentical(a, b);

3
modules/angular2/test/core/change_detection/change_detector_config.ts
View File

@ -418,7 +418,8 @@ var _availableDefinitions = [
'a()(99)',
'a.sayHi("Jim")',
'passThrough([12])',
'invalidFn(1)'
'invalidFn(1)',
'age'
];
var _availableEventDefinitions = [

23
modules/angular2/test/core/change_detection/change_detector_spec.ts
View File

@ -17,8 +17,10 @@ import {
CONST_EXPR,
isPresent,
isBlank,
isNumber,
isJsObject,
FunctionWrapper,
NumberWrapper,
normalizeBool
} from 'angular2/src/core/facade/lang';
import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
@ -258,6 +260,19 @@ export function main() {
expect(_bindSimpleValue('a.sayHi("Jim")', td)).toEqual(['propName=Hi, Jim']);
});
it('should support NaN', () => {
var person = new Person('misko');
person.age = NumberWrapper.NaN;
var val = _createChangeDetector('age', person);
val.changeDetector.detectChanges();
expect(val.dispatcher.log).toEqual(['propName=NaN']);
val.dispatcher.clear();
val.changeDetector.detectChanges();
expect(val.dispatcher.log).toEqual([]);
});
it('should do simple watching', () => {
var person = new Person('misko');
var val = _createChangeDetector('name', person);
@ -1420,7 +1435,13 @@ class TestDispatcher implements ChangeDispatcher {
getDebugContext(a, b) { return null; }
_asString(value) { return (isBlank(value) ? 'null' : value.toString()); }
_asString(value) {
if (isNumber(value) && NumberWrapper.isNaN(value)) {
return 'NaN';
}
return isBlank(value) ? 'null' : value.toString();
}
}
class _ChangeDetectorAndDispatcher {

8
modules_dart/transform/lib/src/transform/template_compiler/change_detector_codegen.dart
View File

@ -354,7 +354,7 @@ class _CodegenState {
var pipeType = r.name;
var init = '''
if (${_genPrefix}$_IDENTICAL_CHECK_FN($pipe, ${_genPrefix}$_UTIL.uninitialized)) {
if ($pipe == ${_genPrefix}$_UTIL.uninitialized) {
$pipe = ${_names.getPipesAccessorName()}.get('$pipeType');
}
''';
@ -368,7 +368,7 @@ class _CodegenState {
var condition = '''!${pipe}.pure || (${contexOrArgCheck.join(" || ")})''';
var check = '''
if (${_genPrefix}$_NOT_IDENTICAL_CHECK_FN($oldValue, $newValue)) {
if (${_genPrefix}$_UTIL.looseNotIdentical($oldValue, $newValue)) {
$newValue = ${_genPrefix}$_UTIL.unwrapValue($newValue);
${_genChangeMarker(r)}
${_genUpdateDirectiveOrElement(r)}
@ -394,7 +394,7 @@ class _CodegenState {
''';
var check = '''
if (${_genPrefix}$_NOT_IDENTICAL_CHECK_FN($newValue, $oldValue)) {
if (${_genPrefix}$_UTIL.looseNotIdentical($newValue, $oldValue)) {
${_genChangeMarker(r)}
${_genUpdateDirectiveOrElement(r)}
${_genAddToChanges(r)}
@ -532,8 +532,6 @@ const _CHANGES_LOCAL = 'changes';
const _GEN_PREFIX = '_gen';
const _GEN_PREFIX_WITH_DOT = _GEN_PREFIX + '.';
const _GEN_RECORDS_METHOD_NAME = '_createRecords';
const _IDENTICAL_CHECK_FN = 'looseIdentical';
const _NOT_IDENTICAL_CHECK_FN = 'looseNotIdentical';
const _IS_CHANGED_LOCAL = 'isChanged';
const _PREGEN_PROTO_CHANGE_DETECTOR_IMPORT =
'package:angular2/src/core/change_detection/pregen_proto_change_detector.dart';