parent
6d760666a9
commit
de18da2a0d
@ -275,17 +275,19 @@ gulp.task('enforce-format', function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('lint', ['build.tools'], function() {
|
gulp.task('lint', ['build.tools'], function() {
|
||||||
|
// Built-in rules are at
|
||||||
// https://github.com/palantir/tslint#supported-rules
|
// https://github.com/palantir/tslint#supported-rules
|
||||||
var tslintConfig = {
|
var tslintConfig = {
|
||||||
"rules": {
|
"rules": {
|
||||||
"semicolon": true,
|
"semicolon": true,
|
||||||
"requireReturnType": true
|
"requireReturnType": true,
|
||||||
|
"requireParameterType": true
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return gulp.src(['modules/angular2/src/**/*.ts', '!modules/angular2/src/test_lib/**'])
|
return gulp.src(['modules/angular2/src/**/*.ts', '!modules/angular2/src/test_lib/**'])
|
||||||
.pipe(tslint({configuration: tslintConfig, rulesDirectory: 'dist/tools/tslint'}))
|
.pipe(tslint({configuration: tslintConfig, rulesDirectory: 'dist/tools/tslint'}))
|
||||||
.pipe(tslint.report('prose'));
|
.pipe(tslint.report('prose', {emitError: true}));
|
||||||
});
|
});
|
||||||
|
|
||||||
// ------------
|
// ------------
|
||||||
|
@ -45,6 +45,7 @@ function _simpleChange(previousValue, currentValue): SimpleChange {
|
|||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* tslint:disable:requireParameterType */
|
||||||
export class ChangeDetectionUtil {
|
export class ChangeDetectionUtil {
|
||||||
static uninitialized(): Object { return uninitialized; }
|
static uninitialized(): Object { return uninitialized; }
|
||||||
|
|
||||||
|
@ -3,11 +3,11 @@ import {List, Map, ListWrapper, StringMapWrapper} from "angular2/src/facade/coll
|
|||||||
import {Locals} from "./locals";
|
import {Locals} from "./locals";
|
||||||
|
|
||||||
export class AST {
|
export class AST {
|
||||||
eval(context, locals: Locals) { throw new BaseException("Not supported"); }
|
eval(context: any, locals: Locals): any { throw new BaseException("Not supported"); }
|
||||||
|
|
||||||
get isAssignable(): boolean { return false; }
|
get isAssignable(): boolean { return false; }
|
||||||
|
|
||||||
assign(context, locals: Locals, value) { throw new BaseException("Not supported"); }
|
assign(context: any, locals: Locals, value: any) { throw new BaseException("Not supported"); }
|
||||||
|
|
||||||
visit(visitor: AstVisitor): any { return null; }
|
visit(visitor: AstVisitor): any { return null; }
|
||||||
|
|
||||||
@ -15,7 +15,7 @@ export class AST {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class EmptyExpr extends AST {
|
export class EmptyExpr extends AST {
|
||||||
eval(context, locals: Locals): any { return null; }
|
eval(context: any, locals: Locals): any { return null; }
|
||||||
|
|
||||||
visit(visitor: AstVisitor) {
|
visit(visitor: AstVisitor) {
|
||||||
// do nothing
|
// do nothing
|
||||||
@ -23,7 +23,7 @@ export class EmptyExpr extends AST {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class ImplicitReceiver extends AST {
|
export class ImplicitReceiver extends AST {
|
||||||
eval(context, locals: Locals): any { return context; }
|
eval(context: any, locals: Locals): any { return context; }
|
||||||
|
|
||||||
visit(visitor: AstVisitor): any { return visitor.visitImplicitReceiver(this); }
|
visit(visitor: AstVisitor): any { return visitor.visitImplicitReceiver(this); }
|
||||||
}
|
}
|
||||||
@ -34,7 +34,7 @@ export class ImplicitReceiver extends AST {
|
|||||||
export class Chain extends AST {
|
export class Chain extends AST {
|
||||||
constructor(public expressions: List<any>) { super(); }
|
constructor(public expressions: List<any>) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
var result;
|
var result;
|
||||||
for (var i = 0; i < this.expressions.length; i++) {
|
for (var i = 0; i < this.expressions.length; i++) {
|
||||||
var last = this.expressions[i].eval(context, locals);
|
var last = this.expressions[i].eval(context, locals);
|
||||||
@ -49,7 +49,7 @@ export class Chain extends AST {
|
|||||||
export class Conditional extends AST {
|
export class Conditional extends AST {
|
||||||
constructor(public condition: AST, public trueExp: AST, public falseExp: AST) { super(); }
|
constructor(public condition: AST, public trueExp: AST, public falseExp: AST) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
if (this.condition.eval(context, locals)) {
|
if (this.condition.eval(context, locals)) {
|
||||||
return this.trueExp.eval(context, locals);
|
return this.trueExp.eval(context, locals);
|
||||||
} else {
|
} else {
|
||||||
@ -63,7 +63,7 @@ export class Conditional extends AST {
|
|||||||
export class If extends AST {
|
export class If extends AST {
|
||||||
constructor(public condition: AST, public trueExp: AST, public falseExp?: AST) { super(); }
|
constructor(public condition: AST, public trueExp: AST, public falseExp?: AST) { super(); }
|
||||||
|
|
||||||
eval(context, locals) {
|
eval(context: any, locals: Locals) {
|
||||||
if (this.condition.eval(context, locals)) {
|
if (this.condition.eval(context, locals)) {
|
||||||
this.trueExp.eval(context, locals);
|
this.trueExp.eval(context, locals);
|
||||||
} else if (isPresent(this.falseExp)) {
|
} else if (isPresent(this.falseExp)) {
|
||||||
@ -80,7 +80,7 @@ export class AccessMember extends AST {
|
|||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
if (this.receiver instanceof ImplicitReceiver && isPresent(locals) &&
|
if (this.receiver instanceof ImplicitReceiver && isPresent(locals) &&
|
||||||
locals.contains(this.name)) {
|
locals.contains(this.name)) {
|
||||||
return locals.get(this.name);
|
return locals.get(this.name);
|
||||||
@ -92,7 +92,7 @@ export class AccessMember extends AST {
|
|||||||
|
|
||||||
get isAssignable(): boolean { return true; }
|
get isAssignable(): boolean { return true; }
|
||||||
|
|
||||||
assign(context, locals: Locals, value): any {
|
assign(context: any, locals: Locals, value: any): any {
|
||||||
var evaluatedContext = this.receiver.eval(context, locals);
|
var evaluatedContext = this.receiver.eval(context, locals);
|
||||||
|
|
||||||
if (this.receiver instanceof ImplicitReceiver && isPresent(locals) &&
|
if (this.receiver instanceof ImplicitReceiver && isPresent(locals) &&
|
||||||
@ -112,7 +112,7 @@ export class SafeAccessMember extends AST {
|
|||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
var evaluatedReceiver = this.receiver.eval(context, locals);
|
var evaluatedReceiver = this.receiver.eval(context, locals);
|
||||||
return isBlank(evaluatedReceiver) ? null : this.getter(evaluatedReceiver);
|
return isBlank(evaluatedReceiver) ? null : this.getter(evaluatedReceiver);
|
||||||
}
|
}
|
||||||
@ -123,7 +123,7 @@ export class SafeAccessMember extends AST {
|
|||||||
export class KeyedAccess extends AST {
|
export class KeyedAccess extends AST {
|
||||||
constructor(public obj: AST, public key: AST) { super(); }
|
constructor(public obj: AST, public key: AST) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
var obj: any = this.obj.eval(context, locals);
|
var obj: any = this.obj.eval(context, locals);
|
||||||
var key: any = this.key.eval(context, locals);
|
var key: any = this.key.eval(context, locals);
|
||||||
return obj[key];
|
return obj[key];
|
||||||
@ -131,7 +131,7 @@ export class KeyedAccess extends AST {
|
|||||||
|
|
||||||
get isAssignable(): boolean { return true; }
|
get isAssignable(): boolean { return true; }
|
||||||
|
|
||||||
assign(context, locals: Locals, value): any {
|
assign(context: any, locals: Locals, value: any): any {
|
||||||
var obj: any = this.obj.eval(context, locals);
|
var obj: any = this.obj.eval(context, locals);
|
||||||
var key: any = this.key.eval(context, locals);
|
var key: any = this.key.eval(context, locals);
|
||||||
obj[key] = value;
|
obj[key] = value;
|
||||||
@ -150,7 +150,7 @@ export class BindingPipe extends AST {
|
|||||||
export class LiteralPrimitive extends AST {
|
export class LiteralPrimitive extends AST {
|
||||||
constructor(public value) { super(); }
|
constructor(public value) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any { return this.value; }
|
eval(context: any, locals: Locals): any { return this.value; }
|
||||||
|
|
||||||
visit(visitor: AstVisitor): any { return visitor.visitLiteralPrimitive(this); }
|
visit(visitor: AstVisitor): any { return visitor.visitLiteralPrimitive(this); }
|
||||||
}
|
}
|
||||||
@ -158,7 +158,7 @@ export class LiteralPrimitive extends AST {
|
|||||||
export class LiteralArray extends AST {
|
export class LiteralArray extends AST {
|
||||||
constructor(public expressions: List<any>) { super(); }
|
constructor(public expressions: List<any>) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
return ListWrapper.map(this.expressions, (e) => e.eval(context, locals));
|
return ListWrapper.map(this.expressions, (e) => e.eval(context, locals));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -168,7 +168,7 @@ export class LiteralArray extends AST {
|
|||||||
export class LiteralMap extends AST {
|
export class LiteralMap extends AST {
|
||||||
constructor(public keys: List<any>, public values: List<any>) { super(); }
|
constructor(public keys: List<any>, public values: List<any>) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
var res = StringMapWrapper.create();
|
var res = StringMapWrapper.create();
|
||||||
for (var i = 0; i < this.keys.length; ++i) {
|
for (var i = 0; i < this.keys.length; ++i) {
|
||||||
StringMapWrapper.set(res, this.keys[i], this.values[i].eval(context, locals));
|
StringMapWrapper.set(res, this.keys[i], this.values[i].eval(context, locals));
|
||||||
@ -182,7 +182,7 @@ export class LiteralMap extends AST {
|
|||||||
export class Interpolation extends AST {
|
export class Interpolation extends AST {
|
||||||
constructor(public strings: List<any>, public expressions: List<any>) { super(); }
|
constructor(public strings: List<any>, public expressions: List<any>) { super(); }
|
||||||
|
|
||||||
eval(context, locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
throw new BaseException("evaluating an Interpolation is not supported");
|
throw new BaseException("evaluating an Interpolation is not supported");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -192,7 +192,7 @@ export class Interpolation extends AST {
|
|||||||
export class Binary extends AST {
|
export class Binary extends AST {
|
||||||
constructor(public operation: string, public left: AST, public right: AST) { super(); }
|
constructor(public operation: string, public left: AST, public right: AST) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
var left: any = this.left.eval(context, locals);
|
var left: any = this.left.eval(context, locals);
|
||||||
switch (this.operation) {
|
switch (this.operation) {
|
||||||
case '&&':
|
case '&&':
|
||||||
@ -243,15 +243,15 @@ export class Binary extends AST {
|
|||||||
export class PrefixNot extends AST {
|
export class PrefixNot extends AST {
|
||||||
constructor(public expression: AST) { super(); }
|
constructor(public expression: AST) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any { return !this.expression.eval(context, locals); }
|
eval(context: any, locals: Locals): any { return !this.expression.eval(context, locals); }
|
||||||
|
|
||||||
visit(visitor: AstVisitor): any { return visitor.visitPrefixNot(this); }
|
visit(visitor: AstVisitor): any { return visitor.visitPrefixNot(this); }
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Assignment extends AST {
|
export class Assignment extends AST {
|
||||||
constructor(public target: AST, public value: AST) { super(); }
|
constructor(public target: AST, public value: any) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
return this.target.assign(context, locals, this.value.eval(context, locals));
|
return this.target.assign(context, locals, this.value.eval(context, locals));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -264,7 +264,7 @@ export class MethodCall extends AST {
|
|||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
var evaluatedArgs = evalList(context, locals, this.args);
|
var evaluatedArgs = evalList(context, locals, this.args);
|
||||||
if (this.receiver instanceof ImplicitReceiver && isPresent(locals) &&
|
if (this.receiver instanceof ImplicitReceiver && isPresent(locals) &&
|
||||||
locals.contains(this.name)) {
|
locals.contains(this.name)) {
|
||||||
@ -285,7 +285,7 @@ export class SafeMethodCall extends AST {
|
|||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
var evaluatedReceiver = this.receiver.eval(context, locals);
|
var evaluatedReceiver = this.receiver.eval(context, locals);
|
||||||
if (isBlank(evaluatedReceiver)) return null;
|
if (isBlank(evaluatedReceiver)) return null;
|
||||||
var evaluatedArgs = evalList(context, locals, this.args);
|
var evaluatedArgs = evalList(context, locals, this.args);
|
||||||
@ -298,7 +298,7 @@ export class SafeMethodCall extends AST {
|
|||||||
export class FunctionCall extends AST {
|
export class FunctionCall extends AST {
|
||||||
constructor(public target: AST, public args: List<any>) { super(); }
|
constructor(public target: AST, public args: List<any>) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any {
|
eval(context: any, locals: Locals): any {
|
||||||
var obj: any = this.target.eval(context, locals);
|
var obj: any = this.target.eval(context, locals);
|
||||||
if (!(obj instanceof Function)) {
|
if (!(obj instanceof Function)) {
|
||||||
throw new BaseException(`${obj} is not a function`);
|
throw new BaseException(`${obj} is not a function`);
|
||||||
@ -312,11 +312,13 @@ export class FunctionCall extends AST {
|
|||||||
export class ASTWithSource extends AST {
|
export class ASTWithSource extends AST {
|
||||||
constructor(public ast: AST, public source: string, public location: string) { super(); }
|
constructor(public ast: AST, public source: string, public location: string) { super(); }
|
||||||
|
|
||||||
eval(context, locals: Locals): any { return this.ast.eval(context, locals); }
|
eval(context: any, locals: Locals): any { return this.ast.eval(context, locals); }
|
||||||
|
|
||||||
get isAssignable(): boolean { return this.ast.isAssignable; }
|
get isAssignable(): boolean { return this.ast.isAssignable; }
|
||||||
|
|
||||||
assign(context, locals: Locals, value): any { return this.ast.assign(context, locals, value); }
|
assign(context: any, locals: Locals, value: any): any {
|
||||||
|
return this.ast.assign(context, locals, value);
|
||||||
|
}
|
||||||
|
|
||||||
visit(visitor: AstVisitor): any { return this.ast.visit(visitor); }
|
visit(visitor: AstVisitor): any { return this.ast.visit(visitor); }
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ export class Locals {
|
|||||||
throw new BaseException(`Cannot find '${name}'`);
|
throw new BaseException(`Cannot find '${name}'`);
|
||||||
}
|
}
|
||||||
|
|
||||||
set(name: string, value): void {
|
set(name: string, value: any): void {
|
||||||
// TODO(rado): consider removing this check if we can guarantee this is not
|
// TODO(rado): consider removing this check if we can guarantee this is not
|
||||||
// exposed to the public API.
|
// exposed to the public API.
|
||||||
// TODO: vsavkin maybe it should check only the local map
|
// TODO: vsavkin maybe it should check only the local map
|
||||||
|
@ -479,7 +479,7 @@ class _ParseAST {
|
|||||||
return new LiteralMap(keys, values);
|
return new LiteralMap(keys, values);
|
||||||
}
|
}
|
||||||
|
|
||||||
parseAccessMemberOrMethodCall(receiver, isSafe: boolean = false): AST {
|
parseAccessMemberOrMethodCall(receiver: AST, isSafe: boolean = false): AST {
|
||||||
let id = this.expectIdentifierOrKeyword();
|
let id = this.expectIdentifierOrKeyword();
|
||||||
|
|
||||||
if (this.optionalCharacter($LPAREN)) {
|
if (this.optionalCharacter($LPAREN)) {
|
||||||
|
@ -83,7 +83,7 @@ export class DatePipe extends BasePipe implements PipeFactory {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
transform(value, args: List<any>): string {
|
transform(value: any, args: List<any>): string {
|
||||||
var pattern: string = isPresent(args) && args.length > 0 ? args[0] : 'mediumDate';
|
var pattern: string = isPresent(args) && args.length > 0 ? args[0] : 'mediumDate';
|
||||||
if (isNumber(value)) {
|
if (isNumber(value)) {
|
||||||
value = DateWrapper.fromMillis(value);
|
value = DateWrapper.fromMillis(value);
|
||||||
@ -94,7 +94,7 @@ export class DatePipe extends BasePipe implements PipeFactory {
|
|||||||
return DateFormatter.format(value, defaultLocale, pattern);
|
return DateFormatter.format(value, defaultLocale, pattern);
|
||||||
}
|
}
|
||||||
|
|
||||||
supports(obj): boolean { return isDate(obj) || isNumber(obj); }
|
supports(obj: any): boolean { return isDate(obj) || isNumber(obj); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return this; }
|
create(cdRef: ChangeDetectorRef): Pipe { return this; }
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ import {ChangeDetectorRef} from '../change_detector_ref';
|
|||||||
|
|
||||||
@CONST()
|
@CONST()
|
||||||
export class IterableChangesFactory implements PipeFactory {
|
export class IterableChangesFactory implements PipeFactory {
|
||||||
supports(obj): boolean { return IterableChanges.supportsObj(obj); }
|
supports(obj: any): boolean { return IterableChanges.supportsObj(obj); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return new IterableChanges(); }
|
create(cdRef: ChangeDetectorRef): Pipe { return new IterableChanges(); }
|
||||||
}
|
}
|
||||||
@ -44,9 +44,9 @@ export class IterableChanges extends BasePipe {
|
|||||||
|
|
||||||
constructor() { super(); }
|
constructor() { super(); }
|
||||||
|
|
||||||
static supportsObj(obj): boolean { return isListLikeIterable(obj); }
|
static supportsObj(obj: Object): boolean { return isListLikeIterable(obj); }
|
||||||
|
|
||||||
supports(obj): boolean { return IterableChanges.supportsObj(obj); }
|
supports(obj: Object): boolean { return IterableChanges.supportsObj(obj); }
|
||||||
|
|
||||||
get collection() { return this._collection; }
|
get collection() { return this._collection; }
|
||||||
|
|
||||||
@ -87,7 +87,7 @@ export class IterableChanges extends BasePipe {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
transform(collection, args: List<any> = null): any {
|
transform(collection: any, args: List<any> = null): any {
|
||||||
if (this.check(collection)) {
|
if (this.check(collection)) {
|
||||||
return WrappedValue.wrap(this);
|
return WrappedValue.wrap(this);
|
||||||
} else {
|
} else {
|
||||||
@ -96,7 +96,7 @@ export class IterableChanges extends BasePipe {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// todo(vicb): optim for UnmodifiableListView (frozen arrays)
|
// todo(vicb): optim for UnmodifiableListView (frozen arrays)
|
||||||
check(collection): boolean {
|
check(collection: any): boolean {
|
||||||
this._reset();
|
this._reset();
|
||||||
|
|
||||||
var record: CollectionChangeRecord = this._itHead;
|
var record: CollectionChangeRecord = this._itHead;
|
||||||
@ -524,7 +524,7 @@ class _DuplicateItemRecordList {
|
|||||||
|
|
||||||
// Returns a CollectionChangeRecord having CollectionChangeRecord.item == item and
|
// Returns a CollectionChangeRecord having CollectionChangeRecord.item == item and
|
||||||
// CollectionChangeRecord.currentIndex >= afterIndex
|
// CollectionChangeRecord.currentIndex >= afterIndex
|
||||||
get(item, afterIndex: int): CollectionChangeRecord {
|
get(item: any, afterIndex: int): CollectionChangeRecord {
|
||||||
var record: CollectionChangeRecord;
|
var record: CollectionChangeRecord;
|
||||||
for (record = this._head; record !== null; record = record._nextDup) {
|
for (record = this._head; record !== null; record = record._nextDup) {
|
||||||
if ((afterIndex === null || afterIndex < record.currentIndex) &&
|
if ((afterIndex === null || afterIndex < record.currentIndex) &&
|
||||||
@ -588,7 +588,7 @@ class _DuplicateMap {
|
|||||||
* Use case: `[a, b, c, a, a]` if we are at index `3` which is the second `a` then asking if we
|
* Use case: `[a, b, c, a, a]` if we are at index `3` which is the second `a` then asking if we
|
||||||
* have any more `a`s needs to return the last `a` not the first or second.
|
* have any more `a`s needs to return the last `a` not the first or second.
|
||||||
*/
|
*/
|
||||||
get(value, afterIndex = null): CollectionChangeRecord {
|
get(value: any, afterIndex: int = null): CollectionChangeRecord {
|
||||||
var key = getMapKey(value);
|
var key = getMapKey(value);
|
||||||
|
|
||||||
var recordList = this.map.get(key);
|
var recordList = this.map.get(key);
|
||||||
|
@ -27,7 +27,7 @@ import {ChangeDetectorRef} from '../change_detector_ref';
|
|||||||
*/
|
*/
|
||||||
@CONST()
|
@CONST()
|
||||||
export class JsonPipe extends BasePipe implements PipeFactory {
|
export class JsonPipe extends BasePipe implements PipeFactory {
|
||||||
transform(value, args: List<any> = null): string { return Json.stringify(value); }
|
transform(value: any, args: List<any> = null): string { return Json.stringify(value); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return this; }
|
create(cdRef: ChangeDetectorRef): Pipe { return this; }
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@ import {WrappedValue, BasePipe, Pipe, PipeFactory} from './pipe';
|
|||||||
|
|
||||||
@CONST()
|
@CONST()
|
||||||
export class KeyValueChangesFactory implements PipeFactory {
|
export class KeyValueChangesFactory implements PipeFactory {
|
||||||
supports(obj): boolean { return KeyValueChanges.supportsObj(obj); }
|
supports(obj: any): boolean { return KeyValueChanges.supportsObj(obj); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return new KeyValueChanges(); }
|
create(cdRef: ChangeDetectorRef): Pipe { return new KeyValueChanges(); }
|
||||||
}
|
}
|
||||||
@ -21,11 +21,11 @@ export class KeyValueChanges extends BasePipe {
|
|||||||
private _removalsHead: KVChangeRecord = null;
|
private _removalsHead: KVChangeRecord = null;
|
||||||
private _removalsTail: KVChangeRecord = null;
|
private _removalsTail: KVChangeRecord = null;
|
||||||
|
|
||||||
static supportsObj(obj): boolean { return obj instanceof Map || isJsObject(obj); }
|
static supportsObj(obj: any): boolean { return obj instanceof Map || isJsObject(obj); }
|
||||||
|
|
||||||
supports(obj): boolean { return KeyValueChanges.supportsObj(obj); }
|
supports(obj: any): boolean { return KeyValueChanges.supportsObj(obj); }
|
||||||
|
|
||||||
transform(map, args: List<any> = null): any {
|
transform(map: Map<any, any>, args: List<any> = null): any {
|
||||||
if (this.check(map)) {
|
if (this.check(map)) {
|
||||||
return WrappedValue.wrap(this);
|
return WrappedValue.wrap(this);
|
||||||
} else {
|
} else {
|
||||||
@ -73,7 +73,7 @@ export class KeyValueChanges extends BasePipe {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
check(map): boolean {
|
check(map: Map<any, any>): boolean {
|
||||||
this._reset();
|
this._reset();
|
||||||
var records = this._records;
|
var records = this._records;
|
||||||
var oldSeqRecord: KVChangeRecord = this._mapHead;
|
var oldSeqRecord: KVChangeRecord = this._mapHead;
|
||||||
|
@ -51,11 +51,11 @@ import {ChangeDetectorRef} from '../change_detector_ref';
|
|||||||
* {{ 'abcdefghij' | limitTo: -100 }} // output is 'abcdefghij'
|
* {{ 'abcdefghij' | limitTo: -100 }} // output is 'abcdefghij'
|
||||||
*/
|
*/
|
||||||
export class LimitToPipe implements Pipe {
|
export class LimitToPipe implements Pipe {
|
||||||
static supportsObj(obj): boolean { return isString(obj) || isArray(obj); }
|
static supportsObj(obj: any): boolean { return isString(obj) || isArray(obj); }
|
||||||
|
|
||||||
supports(obj): boolean { return LimitToPipe.supportsObj(obj); }
|
supports(obj: any): boolean { return LimitToPipe.supportsObj(obj); }
|
||||||
|
|
||||||
transform(value, args: List<any> = null): any {
|
transform(value: any, args: List<any> = null): any {
|
||||||
if (isBlank(args) || args.length == 0) {
|
if (isBlank(args) || args.length == 0) {
|
||||||
throw new BaseException('limitTo pipe requires one argument');
|
throw new BaseException('limitTo pipe requires one argument');
|
||||||
}
|
}
|
||||||
@ -76,7 +76,7 @@ export class LimitToPipe implements Pipe {
|
|||||||
|
|
||||||
@CONST()
|
@CONST()
|
||||||
export class LimitToPipeFactory implements PipeFactory {
|
export class LimitToPipeFactory implements PipeFactory {
|
||||||
supports(obj): boolean { return LimitToPipe.supportsObj(obj); }
|
supports(obj: any): boolean { return LimitToPipe.supportsObj(obj); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return new LimitToPipe(); }
|
create(cdRef: ChangeDetectorRef): Pipe { return new LimitToPipe(); }
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ import {ChangeDetectorRef} from '../change_detector_ref';
|
|||||||
export class LowerCasePipe implements Pipe {
|
export class LowerCasePipe implements Pipe {
|
||||||
_latestValue: string = null;
|
_latestValue: string = null;
|
||||||
|
|
||||||
supports(str): boolean { return isString(str); }
|
supports(str: any): boolean { return isString(str); }
|
||||||
|
|
||||||
onDestroy(): void { this._latestValue = null; }
|
onDestroy(): void { this._latestValue = null; }
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ export class LowerCasePipe implements Pipe {
|
|||||||
|
|
||||||
@CONST()
|
@CONST()
|
||||||
export class LowerCaseFactory implements PipeFactory {
|
export class LowerCaseFactory implements PipeFactory {
|
||||||
supports(str): boolean { return isString(str); }
|
supports(str: any): boolean { return isString(str); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return new LowerCasePipe(); }
|
create(cdRef: ChangeDetectorRef): Pipe { return new LowerCasePipe(); }
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ import {ChangeDetectorRef} from '../change_detector_ref';
|
|||||||
|
|
||||||
@CONST()
|
@CONST()
|
||||||
export class NullPipeFactory implements PipeFactory {
|
export class NullPipeFactory implements PipeFactory {
|
||||||
supports(obj): boolean { return NullPipe.supportsObj(obj); }
|
supports(obj: any): boolean { return NullPipe.supportsObj(obj); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return new NullPipe(); }
|
create(cdRef: ChangeDetectorRef): Pipe { return new NullPipe(); }
|
||||||
}
|
}
|
||||||
@ -12,11 +12,11 @@ export class NullPipeFactory implements PipeFactory {
|
|||||||
export class NullPipe extends BasePipe {
|
export class NullPipe extends BasePipe {
|
||||||
called: boolean = false;
|
called: boolean = false;
|
||||||
|
|
||||||
static supportsObj(obj): boolean { return isBlank(obj); }
|
static supportsObj(obj: any): boolean { return isBlank(obj); }
|
||||||
|
|
||||||
supports(obj): boolean { return NullPipe.supportsObj(obj); }
|
supports(obj: any): boolean { return NullPipe.supportsObj(obj); }
|
||||||
|
|
||||||
transform(value, args: List<any> = null): WrappedValue {
|
transform(value: any, args: List<any> = null): WrappedValue {
|
||||||
if (!this.called) {
|
if (!this.called) {
|
||||||
this.called = true;
|
this.called = true;
|
||||||
return WrappedValue.wrap(null);
|
return WrappedValue.wrap(null);
|
||||||
|
@ -46,7 +46,7 @@ export class NumberPipe extends BasePipe implements PipeFactory {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
supports(obj): boolean { return isNumber(obj); }
|
supports(obj: any): boolean { return isNumber(obj); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return this; }
|
create(cdRef: ChangeDetectorRef): Pipe { return this; }
|
||||||
}
|
}
|
||||||
@ -78,7 +78,7 @@ export class NumberPipe extends BasePipe implements PipeFactory {
|
|||||||
*/
|
*/
|
||||||
@CONST()
|
@CONST()
|
||||||
export class DecimalPipe extends NumberPipe {
|
export class DecimalPipe extends NumberPipe {
|
||||||
transform(value, args: any[]): string {
|
transform(value: any, args: any[]): string {
|
||||||
var digits: string = ListWrapper.first(args);
|
var digits: string = ListWrapper.first(args);
|
||||||
return NumberPipe._format(value, NumberFormatStyle.DECIMAL, digits);
|
return NumberPipe._format(value, NumberFormatStyle.DECIMAL, digits);
|
||||||
}
|
}
|
||||||
@ -95,7 +95,7 @@ export class DecimalPipe extends NumberPipe {
|
|||||||
*/
|
*/
|
||||||
@CONST()
|
@CONST()
|
||||||
export class PercentPipe extends NumberPipe {
|
export class PercentPipe extends NumberPipe {
|
||||||
transform(value, args: any[]): string {
|
transform(value: any, args: any[]): string {
|
||||||
var digits: string = ListWrapper.first(args);
|
var digits: string = ListWrapper.first(args);
|
||||||
return NumberPipe._format(value, NumberFormatStyle.PERCENT, digits);
|
return NumberPipe._format(value, NumberFormatStyle.PERCENT, digits);
|
||||||
}
|
}
|
||||||
@ -116,7 +116,7 @@ export class PercentPipe extends NumberPipe {
|
|||||||
*/
|
*/
|
||||||
@CONST()
|
@CONST()
|
||||||
export class CurrencyPipe extends NumberPipe {
|
export class CurrencyPipe extends NumberPipe {
|
||||||
transform(value, args: any[]): string {
|
transform(value: any, args: any[]): string {
|
||||||
var currencyCode: string = isPresent(args) && args.length > 0 ? args[0] : 'USD';
|
var currencyCode: string = isPresent(args) && args.length > 0 ? args[0] : 'USD';
|
||||||
var symbolDisplay: boolean = isPresent(args) && args.length > 1 ? args[1] : false;
|
var symbolDisplay: boolean = isPresent(args) && args.length > 1 ? args[1] : false;
|
||||||
var digits: string = isPresent(args) && args.length > 2 ? args[2] : null;
|
var digits: string = isPresent(args) && args.length > 2 ? args[2] : null;
|
||||||
|
@ -36,7 +36,7 @@ export class ObservablePipe implements Pipe {
|
|||||||
|
|
||||||
constructor(public _ref: ChangeDetectorRef) {}
|
constructor(public _ref: ChangeDetectorRef) {}
|
||||||
|
|
||||||
supports(obs): boolean { return ObservableWrapper.isObservable(obs); }
|
supports(obs: any): boolean { return ObservableWrapper.isObservable(obs); }
|
||||||
|
|
||||||
onDestroy(): void {
|
onDestroy(): void {
|
||||||
if (isPresent(this._subscription)) {
|
if (isPresent(this._subscription)) {
|
||||||
@ -88,7 +88,7 @@ export class ObservablePipe implements Pipe {
|
|||||||
*/
|
*/
|
||||||
@CONST()
|
@CONST()
|
||||||
export class ObservablePipeFactory implements PipeFactory {
|
export class ObservablePipeFactory implements PipeFactory {
|
||||||
supports(obs): boolean { return ObservableWrapper.isObservable(obs); }
|
supports(obs: any): boolean { return ObservableWrapper.isObservable(obs); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return new ObservablePipe(cdRef); }
|
create(cdRef: ChangeDetectorRef): Pipe { return new ObservablePipe(cdRef); }
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ export interface Pipe {
|
|||||||
*/
|
*/
|
||||||
@CONST()
|
@CONST()
|
||||||
export class BasePipe implements Pipe {
|
export class BasePipe implements Pipe {
|
||||||
supports(obj): boolean { return true; }
|
supports(obj: any): boolean { return true; }
|
||||||
onDestroy(): void {}
|
onDestroy(): void {}
|
||||||
transform(value: any, args: List<any>): any { return _abstract(); }
|
transform(value: any, args: List<any>): any { return _abstract(); }
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,7 @@ export class Pipes {
|
|||||||
config: StringMap<string, PipeFactory[]>;
|
config: StringMap<string, PipeFactory[]>;
|
||||||
constructor(config: StringMap<string, PipeFactory[]>) { this.config = config; }
|
constructor(config: StringMap<string, PipeFactory[]>) { this.config = config; }
|
||||||
|
|
||||||
get(type: string, obj, cdRef?: ChangeDetectorRef, existingPipe?: Pipe): Pipe {
|
get(type: string, obj: any, cdRef?: ChangeDetectorRef, existingPipe?: Pipe): Pipe {
|
||||||
if (isPresent(existingPipe) && existingPipe.supports(obj)) return existingPipe;
|
if (isPresent(existingPipe) && existingPipe.supports(obj)) return existingPipe;
|
||||||
|
|
||||||
if (isPresent(existingPipe)) existingPipe.onDestroy();
|
if (isPresent(existingPipe)) existingPipe.onDestroy();
|
||||||
@ -67,7 +67,7 @@ export class Pipes {
|
|||||||
* })
|
* })
|
||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
static extend(config): Binding {
|
static extend(config: StringMap<string, PipeFactory[]>): Binding {
|
||||||
return new Binding(Pipes, {
|
return new Binding(Pipes, {
|
||||||
toFactory: (pipes: Pipes) => {
|
toFactory: (pipes: Pipes) => {
|
||||||
if (isBlank(pipes)) {
|
if (isBlank(pipes)) {
|
||||||
@ -82,7 +82,7 @@ export class Pipes {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
static create(config, pipes: Pipes = null): Pipes {
|
static create(config: StringMap<string, PipeFactory[]>, pipes: Pipes = null): Pipes {
|
||||||
if (isPresent(pipes)) {
|
if (isPresent(pipes)) {
|
||||||
StringMapWrapper.forEach(pipes.config, (v: PipeFactory[], k: string) => {
|
StringMapWrapper.forEach(pipes.config, (v: PipeFactory[], k: string) => {
|
||||||
if (StringMapWrapper.contains(config, k)) {
|
if (StringMapWrapper.contains(config, k)) {
|
||||||
|
@ -33,7 +33,7 @@ export class PromisePipe implements Pipe {
|
|||||||
|
|
||||||
constructor(public _ref: ChangeDetectorRef) {}
|
constructor(public _ref: ChangeDetectorRef) {}
|
||||||
|
|
||||||
supports(promise): boolean { return isPromise(promise); }
|
supports(promise: any): boolean { return isPromise(promise); }
|
||||||
|
|
||||||
onDestroy(): void {
|
onDestroy(): void {
|
||||||
if (isPresent(this._sourcePromise)) {
|
if (isPresent(this._sourcePromise)) {
|
||||||
@ -78,7 +78,7 @@ export class PromisePipe implements Pipe {
|
|||||||
*/
|
*/
|
||||||
@CONST()
|
@CONST()
|
||||||
export class PromisePipeFactory implements PipeFactory {
|
export class PromisePipeFactory implements PipeFactory {
|
||||||
supports(promise): boolean { return isPromise(promise); }
|
supports(promise: any): boolean { return isPromise(promise); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return new PromisePipe(cdRef); }
|
create(cdRef: ChangeDetectorRef): Pipe { return new PromisePipe(cdRef); }
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ import {ChangeDetectorRef} from '../change_detector_ref';
|
|||||||
export class UpperCasePipe implements Pipe {
|
export class UpperCasePipe implements Pipe {
|
||||||
_latestValue: string = null;
|
_latestValue: string = null;
|
||||||
|
|
||||||
supports(str): boolean { return isString(str); }
|
supports(str: any): boolean { return isString(str); }
|
||||||
|
|
||||||
onDestroy(): void { this._latestValue = null; }
|
onDestroy(): void { this._latestValue = null; }
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ export class UpperCasePipe implements Pipe {
|
|||||||
|
|
||||||
@CONST()
|
@CONST()
|
||||||
export class UpperCaseFactory implements PipeFactory {
|
export class UpperCaseFactory implements PipeFactory {
|
||||||
supports(str): boolean { return isString(str); }
|
supports(str: any): boolean { return isString(str); }
|
||||||
|
|
||||||
create(cdRef: ChangeDetectorRef): Pipe { return new UpperCasePipe(); }
|
create(cdRef: ChangeDetectorRef): Pipe { return new UpperCasePipe(); }
|
||||||
}
|
}
|
||||||
|
@ -286,7 +286,7 @@ export class EventEmitterAccessor {
|
|||||||
|
|
||||||
subscribe(view: viewModule.AppView, boundElementIndex: number, directive: Object): Object {
|
subscribe(view: viewModule.AppView, boundElementIndex: number, directive: Object): Object {
|
||||||
var eventEmitter = this.getter(directive);
|
var eventEmitter = this.getter(directive);
|
||||||
return ObservableWrapper.subscribe(
|
return ObservableWrapper.subscribe<Event>(
|
||||||
eventEmitter,
|
eventEmitter,
|
||||||
eventObj => view.triggerEventHandlers(this.eventName, eventObj, boundElementIndex));
|
eventObj => view.triggerEventHandlers(this.eventName, eventObj, boundElementIndex));
|
||||||
}
|
}
|
||||||
@ -297,7 +297,7 @@ export class HostActionAccessor {
|
|||||||
|
|
||||||
subscribe(view: viewModule.AppView, boundElementIndex: number, directive: Object): Object {
|
subscribe(view: viewModule.AppView, boundElementIndex: number, directive: Object): Object {
|
||||||
var eventEmitter = this.getter(directive);
|
var eventEmitter = this.getter(directive);
|
||||||
return ObservableWrapper.subscribe(
|
return ObservableWrapper.subscribe<List<any>>(
|
||||||
eventEmitter,
|
eventEmitter,
|
||||||
actionArgs => view.invokeElementMethod(boundElementIndex, this.methodName, actionArgs));
|
actionArgs => view.invokeElementMethod(boundElementIndex, this.methodName, actionArgs));
|
||||||
}
|
}
|
||||||
@ -542,7 +542,7 @@ export class ElementInjector extends TreeNode<ElementInjector> implements Depend
|
|||||||
return isPresent(index) ? this.getDirectiveAtIndex(<number>index) : this.getElementRef();
|
return isPresent(index) ? this.getDirectiveAtIndex(<number>index) : this.getElementRef();
|
||||||
}
|
}
|
||||||
|
|
||||||
get(token): any { return this._injector.get(token); }
|
get(token: any): any { return this._injector.get(token); }
|
||||||
|
|
||||||
hasDirective(type: Type): boolean { return isPresent(this._injector.getOptional(type)); }
|
hasDirective(type: Type): boolean { return isPresent(this._injector.getOptional(type)); }
|
||||||
|
|
||||||
|
@ -135,7 +135,7 @@ export class AppView implements ChangeDispatcher, RenderEventDispatcher {
|
|||||||
this.viewContainers = viewContainers;
|
this.viewContainers = viewContainers;
|
||||||
}
|
}
|
||||||
|
|
||||||
setLocal(contextName: string, value): void {
|
setLocal(contextName: string, value: any): void {
|
||||||
if (!this.hydrated()) throw new BaseException('Cannot set locals on dehydrated view.');
|
if (!this.hydrated()) throw new BaseException('Cannot set locals on dehydrated view.');
|
||||||
if (!this.proto.variableBindings.has(contextName)) {
|
if (!this.proto.variableBindings.has(contextName)) {
|
||||||
return;
|
return;
|
||||||
@ -155,7 +155,7 @@ export class AppView implements ChangeDispatcher, RenderEventDispatcher {
|
|||||||
* @param {*} eventObj
|
* @param {*} eventObj
|
||||||
* @param {int} boundElementIndex
|
* @param {int} boundElementIndex
|
||||||
*/
|
*/
|
||||||
triggerEventHandlers(eventName: string, eventObj, boundElementIndex: int): void {
|
triggerEventHandlers(eventName: string, eventObj: Event, boundElementIndex: int): void {
|
||||||
var locals = new Map();
|
var locals = new Map();
|
||||||
locals.set('$event', eventObj);
|
locals.set('$event', eventObj);
|
||||||
this.dispatchEvent(boundElementIndex, eventName, locals);
|
this.dispatchEvent(boundElementIndex, eventName, locals);
|
||||||
|
@ -33,9 +33,9 @@ import {DOM} from 'angular2/src/dom/dom_adapter';
|
|||||||
*/
|
*/
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ExceptionHandler {
|
export class ExceptionHandler {
|
||||||
call(error, stackTrace = null, reason = null) {
|
call(error: Object, stackTrace: string | List<string> = null, reason: string = null) {
|
||||||
var longStackTrace =
|
var longStackTrace =
|
||||||
isListLikeIterable(stackTrace) ? ListWrapper.join(stackTrace, "\n\n") : stackTrace;
|
isListLikeIterable(stackTrace) ? ListWrapper.join(<any>stackTrace, "\n\n") : stackTrace;
|
||||||
var reasonStr = isPresent(reason) ? `\n${reason}` : '';
|
var reasonStr = isPresent(reason) ? `\n${reason}` : '';
|
||||||
DOM.logError(`${error}${reasonStr}\nSTACKTRACE:\n${longStackTrace}`);
|
DOM.logError(`${error}${reasonStr}\nSTACKTRACE:\n${longStackTrace}`);
|
||||||
}
|
}
|
||||||
|
@ -8,14 +8,14 @@ class PublicTestability {
|
|||||||
|
|
||||||
whenStable(callback: Function) { this._testability.whenStable(callback); }
|
whenStable(callback: Function) { this._testability.whenStable(callback); }
|
||||||
|
|
||||||
findBindings(using, binding: string, exactMatch: boolean): List<any> {
|
findBindings(using: any, binding: string, exactMatch: boolean): List<any> {
|
||||||
return this._testability.findBindings(using, binding, exactMatch);
|
return this._testability.findBindings(using, binding, exactMatch);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class GetTestability {
|
export class GetTestability {
|
||||||
static addToWindow(registry: TestabilityRegistry) {
|
static addToWindow(registry: TestabilityRegistry) {
|
||||||
global.getAngularTestability = function(elem): PublicTestability {
|
global.getAngularTestability = function(elem: Element): PublicTestability {
|
||||||
var testability = registry.findTestabilityInTree(elem);
|
var testability = registry.findTestabilityInTree(elem);
|
||||||
|
|
||||||
if (testability == null) {
|
if (testability == null) {
|
||||||
|
@ -47,7 +47,7 @@ export class Testability {
|
|||||||
|
|
||||||
getPendingCount(): number { return this._pendingCount; }
|
getPendingCount(): number { return this._pendingCount; }
|
||||||
|
|
||||||
findBindings(using, binding: string, exactMatch: boolean): List<any> {
|
findBindings(using: any, binding: string, exactMatch: boolean): List<any> {
|
||||||
// TODO(juliemr): implement.
|
// TODO(juliemr): implement.
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
@ -63,11 +63,11 @@ export class TestabilityRegistry {
|
|||||||
getTestabilityModule.GetTestability.addToWindow(this);
|
getTestabilityModule.GetTestability.addToWindow(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
registerApplication(token, testability: Testability) {
|
registerApplication(token: any, testability: Testability) {
|
||||||
this._applications.set(token, testability);
|
this._applications.set(token, testability);
|
||||||
}
|
}
|
||||||
|
|
||||||
findTestabilityInTree(elem): Testability {
|
findTestabilityInTree(elem: Node): Testability {
|
||||||
if (elem == null) {
|
if (elem == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -121,7 +121,7 @@ export class NgZone {
|
|||||||
* });
|
* });
|
||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
run(fn): any {
|
run(fn: () => any): any {
|
||||||
if (this._disabled) {
|
if (this._disabled) {
|
||||||
return fn();
|
return fn();
|
||||||
} else {
|
} else {
|
||||||
@ -145,7 +145,7 @@ export class NgZone {
|
|||||||
* });
|
* });
|
||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
runOutsideAngular(fn): any {
|
runOutsideAngular(fn: () => any): any {
|
||||||
if (this._disabled) {
|
if (this._disabled) {
|
||||||
return fn();
|
return fn();
|
||||||
} else {
|
} else {
|
||||||
|
@ -65,7 +65,7 @@ export class DebugElement {
|
|||||||
return this._getChildElements(shadowView, null);
|
return this._getChildElements(shadowView, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
triggerEventHandler(eventName, eventObj): void {
|
triggerEventHandler(eventName: string, eventObj: Event): void {
|
||||||
this._parentView.triggerEventHandlers(eventName, eventObj, this._boundElementIndex);
|
this._parentView.triggerEventHandlers(eventName, eventObj, this._boundElementIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ export class DebugElement {
|
|||||||
*
|
*
|
||||||
* @return {DebugElement}
|
* @return {DebugElement}
|
||||||
*/
|
*/
|
||||||
query(predicate: Predicate<DebugElement>, scope = Scope.all): DebugElement {
|
query(predicate: Predicate<DebugElement>, scope: Function = Scope.all): DebugElement {
|
||||||
var results = this.queryAll(predicate, scope);
|
var results = this.queryAll(predicate, scope);
|
||||||
return results.length > 0 ? results[0] : null;
|
return results.length > 0 ? results[0] : null;
|
||||||
}
|
}
|
||||||
@ -108,7 +108,7 @@ export class DebugElement {
|
|||||||
*
|
*
|
||||||
* @return {List<DebugElement>}
|
* @return {List<DebugElement>}
|
||||||
*/
|
*/
|
||||||
queryAll(predicate: Predicate<DebugElement>, scope = Scope.all): List<DebugElement> {
|
queryAll(predicate: Predicate<DebugElement>, scope: Function = Scope.all): List<DebugElement> {
|
||||||
var elementsInScope = scope(this);
|
var elementsInScope = scope(this);
|
||||||
|
|
||||||
return ListWrapper.filter(elementsInScope, predicate);
|
return ListWrapper.filter(elementsInScope, predicate);
|
||||||
@ -146,7 +146,7 @@ export function asNativeElements(arr: List<DebugElement>): List<any> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class Scope {
|
export class Scope {
|
||||||
static all(debugElement): List<DebugElement> {
|
static all(debugElement: DebugElement): List<DebugElement> {
|
||||||
var scope = [];
|
var scope = [];
|
||||||
scope.push(debugElement);
|
scope.push(debugElement);
|
||||||
|
|
||||||
@ -158,7 +158,7 @@ export class Scope {
|
|||||||
|
|
||||||
return scope;
|
return scope;
|
||||||
}
|
}
|
||||||
static light(debugElement): List<DebugElement> {
|
static light(debugElement: DebugElement): List<DebugElement> {
|
||||||
var scope = [];
|
var scope = [];
|
||||||
ListWrapper.forEach(debugElement.children, (child) => {
|
ListWrapper.forEach(debugElement.children, (child) => {
|
||||||
scope.push(child);
|
scope.push(child);
|
||||||
@ -167,7 +167,7 @@ export class Scope {
|
|||||||
return scope;
|
return scope;
|
||||||
}
|
}
|
||||||
|
|
||||||
static view(debugElement): List<DebugElement> {
|
static view(debugElement: DebugElement): List<DebugElement> {
|
||||||
var scope = [];
|
var scope = [];
|
||||||
|
|
||||||
ListWrapper.forEach(debugElement.componentViewChildren, (child) => {
|
ListWrapper.forEach(debugElement.componentViewChildren, (child) => {
|
||||||
|
@ -309,13 +309,13 @@ export class BindingBuilder {
|
|||||||
* expect(injector.get(String)).toEqual('Hello');
|
* expect(injector.get(String)).toEqual('Hello');
|
||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
toValue(value): Binding { return new Binding(this.token, {toValue: value}); }
|
toValue(value: any): Binding { return new Binding(this.token, {toValue: value}); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Binds a key to the alias for an existing key.
|
* Binds a key to the alias for an existing key.
|
||||||
*
|
*
|
||||||
* An alias means that we will return the same instance as if the alias token was used. (This is
|
* An alias means that we will return the same instance as if the alias token was used. (This is
|
||||||
* in contrast to `toClass` where a separet instance of `toClass` will be returned.)
|
* in contrast to `toClass` where a separate instance of `toClass` will be returned.)
|
||||||
*
|
*
|
||||||
* ## Example
|
* ## Example
|
||||||
*
|
*
|
||||||
@ -344,7 +344,7 @@ export class BindingBuilder {
|
|||||||
* expect(injectorClass.get(Vehicle) instanceof Car).toBe(true);
|
* expect(injectorClass.get(Vehicle) instanceof Car).toBe(true);
|
||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
toAlias(aliasToken): Binding {
|
toAlias(aliasToken: /*Type*/ any): Binding {
|
||||||
if (isBlank(aliasToken)) {
|
if (isBlank(aliasToken)) {
|
||||||
throw new BaseException(`Can not alias ${stringify(this.token)} to a blank value!`);
|
throw new BaseException(`Can not alias ${stringify(this.token)} to a blank value!`);
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ export class AbstractBindingError extends BaseException {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TODO(tbosch): Can't do key:Key as this results in a circular dependency!
|
// TODO(tbosch): Can't do key:Key as this results in a circular dependency!
|
||||||
addKey(key): void {
|
addKey(key: any): void {
|
||||||
this.keys.push(key);
|
this.keys.push(key);
|
||||||
this.message = this.constructResolvingMessage(this.keys);
|
this.message = this.constructResolvingMessage(this.keys);
|
||||||
}
|
}
|
||||||
|
@ -480,7 +480,7 @@ export class Injector {
|
|||||||
*binding).
|
*binding).
|
||||||
* @returns an instance represented by the token. Throws if not found.
|
* @returns an instance represented by the token. Throws if not found.
|
||||||
*/
|
*/
|
||||||
get(token): any {
|
get(token: any): any {
|
||||||
return this._getByKey(Key.get(token), DEFAULT_VISIBILITY, false, PUBLIC_AND_PRIVATE);
|
return this._getByKey(Key.get(token), DEFAULT_VISIBILITY, false, PUBLIC_AND_PRIVATE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -490,7 +490,7 @@ export class Injector {
|
|||||||
* @param `token`: usually a `Type`. (Same as the token used while setting up a binding).
|
* @param `token`: usually a `Type`. (Same as the token used while setting up a binding).
|
||||||
* @returns an instance represented by the token. Returns `null` if not found.
|
* @returns an instance represented by the token. Returns `null` if not found.
|
||||||
*/
|
*/
|
||||||
getOptional(token): any {
|
getOptional(token: any): any {
|
||||||
return this._getByKey(Key.get(token), DEFAULT_VISIBILITY, true, PUBLIC_AND_PRIVATE);
|
return this._getByKey(Key.get(token), DEFAULT_VISIBILITY, true, PUBLIC_AND_PRIVATE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ export class Key {
|
|||||||
/**
|
/**
|
||||||
* Retrieves a `Key` for a token.
|
* Retrieves a `Key` for a token.
|
||||||
*/
|
*/
|
||||||
static get(token): Key { return _globalKeyRegistry.get(resolveForwardRef(token)); }
|
static get(token: Object): Key { return _globalKeyRegistry.get(resolveForwardRef(token)); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @returns the number of keys registered in the system.
|
* @returns the number of keys registered in the system.
|
||||||
|
@ -48,6 +48,7 @@ var _chromeNumKeyPadMap = {
|
|||||||
'\x90': 'NumLock'
|
'\x90': 'NumLock'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* tslint:disable:requireParameterType */
|
||||||
export class BrowserDomAdapter extends GenericBrowserDomAdapter {
|
export class BrowserDomAdapter extends GenericBrowserDomAdapter {
|
||||||
static makeCurrent() { setRootDomAdapter(new BrowserDomAdapter()); }
|
static makeCurrent() { setRootDomAdapter(new BrowserDomAdapter()); }
|
||||||
hasProperty(element, name: string): boolean { return name in element; }
|
hasProperty(element, name: string): boolean { return name in element; }
|
||||||
|
@ -12,6 +12,7 @@ function _abstract() {
|
|||||||
return new BaseException('This method is abstract');
|
return new BaseException('This method is abstract');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* tslint:disable:requireParameterType */
|
||||||
/**
|
/**
|
||||||
* Provides DOM operations in an environment-agnostic way.
|
* Provides DOM operations in an environment-agnostic way.
|
||||||
*/
|
*/
|
||||||
|
@ -6,8 +6,8 @@ import {DomAdapter} from './dom_adapter';
|
|||||||
* Provides DOM operations in any browser environment.
|
* Provides DOM operations in any browser environment.
|
||||||
*/
|
*/
|
||||||
export class GenericBrowserDomAdapter extends DomAdapter {
|
export class GenericBrowserDomAdapter extends DomAdapter {
|
||||||
getDistributedNodes(el): List<Node> { return el.getDistributedNodes(); }
|
getDistributedNodes(el: HTMLElement): List<Node> { return (<any>el).getDistributedNodes(); }
|
||||||
resolveAndSetHref(el, baseUrl: string, href: string) {
|
resolveAndSetHref(el: HTMLAnchorElement, baseUrl: string, href: string) {
|
||||||
el.href = href == null ? baseUrl : baseUrl + '/../' + href;
|
el.href = href == null ? baseUrl : baseUrl + '/../' + href;
|
||||||
}
|
}
|
||||||
cssToRules(css: string): List<any> {
|
cssToRules(css: string): List<any> {
|
||||||
|
@ -25,6 +25,7 @@ function _notImplemented(methodName) {
|
|||||||
return new BaseException('This method is not implemented in Parse5DomAdapter: ' + methodName);
|
return new BaseException('This method is not implemented in Parse5DomAdapter: ' + methodName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* tslint:disable:requireParameterType */
|
||||||
export class Parse5DomAdapter extends DomAdapter {
|
export class Parse5DomAdapter extends DomAdapter {
|
||||||
static makeCurrent() { setRootDomAdapter(new Parse5DomAdapter()); }
|
static makeCurrent() { setRootDomAdapter(new Parse5DomAdapter()); }
|
||||||
|
|
||||||
@ -112,7 +113,7 @@ export class Parse5DomAdapter extends DomAdapter {
|
|||||||
onAndCancel(el, evt, listener): Function {
|
onAndCancel(el, evt, listener): Function {
|
||||||
this.on(el, evt, listener);
|
this.on(el, evt, listener);
|
||||||
return () => {
|
return () => {
|
||||||
ListWrapper.remove(StringMapWrapper.get(el._eventListenersMap, evt), listener);
|
ListWrapper.remove(StringMapWrapper.get<List<any>>(el._eventListenersMap, evt), listener);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
dispatchEvent(el, evt) {
|
dispatchEvent(el, evt) {
|
||||||
|
@ -14,9 +14,9 @@ export interface PromiseCompleter<R> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class PromiseWrapper {
|
export class PromiseWrapper {
|
||||||
static resolve(obj): Promise<any> { return Promise.resolve(obj); }
|
static resolve<T>(obj: T): Promise<T> { return Promise.resolve(obj); }
|
||||||
|
|
||||||
static reject(obj, _): Promise<any> { return Promise.reject(obj); }
|
static reject(obj: any, _): Promise<any> { return Promise.reject(obj); }
|
||||||
|
|
||||||
// Note: We can't rename this method into `catch`, as this is not a valid
|
// Note: We can't rename this method into `catch`, as this is not a valid
|
||||||
// method name in Dart.
|
// method name in Dart.
|
||||||
@ -29,8 +29,8 @@ export class PromiseWrapper {
|
|||||||
return Promise.all(promises);
|
return Promise.all(promises);
|
||||||
}
|
}
|
||||||
|
|
||||||
static then<T>(promise: Promise<T>, success: (value: any) => T | Thenable<T>,
|
static then<T, U>(promise: Promise<T>, success: (value: T) => U | Thenable<U>,
|
||||||
rejection?: (error: any, stack?: any) => T | Thenable<T>): Promise<T> {
|
rejection?: (error: any, stack?: any) => U | Thenable<U>): Promise<U> {
|
||||||
return promise.then(success, rejection);
|
return promise.then(success, rejection);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,7 +66,9 @@ export class TimerWrapper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class ObservableWrapper {
|
export class ObservableWrapper {
|
||||||
static subscribe(emitter: Observable, onNext, onThrow = null, onReturn = null): Object {
|
static subscribe<T>(emitter: Observable, onNext: (value: T) => void,
|
||||||
|
onThrow: (exception: any) => void = null,
|
||||||
|
onReturn: () => void = null): Object {
|
||||||
return emitter.observer({next: onNext, throw: onThrow, return: onReturn});
|
return emitter.observer({next: onNext, throw: onThrow, return: onReturn});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -109,7 +111,7 @@ export class EventEmitter extends Observable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
observer(generator): Rx.IDisposable {
|
observer(generator: any): Rx.IDisposable {
|
||||||
return this._subject.observeOn(this._immediateScheduler)
|
return this._subject.observeOn(this._immediateScheduler)
|
||||||
.subscribe((value) => { setTimeout(() => generator.next(value)); },
|
.subscribe((value) => { setTimeout(() => generator.next(value)); },
|
||||||
(error) => generator.throw ? generator.throw(error) : null,
|
(error) => generator.throw ? generator.throw(error) : null,
|
||||||
@ -118,9 +120,9 @@ export class EventEmitter extends Observable {
|
|||||||
|
|
||||||
toRx(): Rx.Observable<any> { return this._subject; }
|
toRx(): Rx.Observable<any> { return this._subject; }
|
||||||
|
|
||||||
next(value) { this._subject.onNext(value); }
|
next(value: any) { this._subject.onNext(value); }
|
||||||
|
|
||||||
throw(error) { this._subject.onError(error); }
|
throw(error: any) { this._subject.onError(error); }
|
||||||
|
|
||||||
return (value?) { this._subject.onCompleted(); }
|
return (value?: any) { this._subject.onCompleted(); }
|
||||||
}
|
}
|
||||||
|
@ -55,7 +55,7 @@ var _clearValues: {(m: Map<any, any>)} = (function() {
|
|||||||
|
|
||||||
export class MapWrapper {
|
export class MapWrapper {
|
||||||
static clone<K, V>(m: Map<K, V>): Map<K, V> { return createMapFromMap(m); }
|
static clone<K, V>(m: Map<K, V>): Map<K, V> { return createMapFromMap(m); }
|
||||||
static createFromStringMap(stringMap): Map<string, any> {
|
static createFromStringMap<T>(stringMap: StringMap<string, T>): Map<string, T> {
|
||||||
var result = new Map();
|
var result = new Map();
|
||||||
for (var prop in stringMap) {
|
for (var prop in stringMap) {
|
||||||
result.set(prop, stringMap[prop]);
|
result.set(prop, stringMap[prop]);
|
||||||
@ -146,13 +146,13 @@ export interface Predicate<T> { (value: T, index?: number, array?: T[]): boolean
|
|||||||
export class ListWrapper {
|
export class ListWrapper {
|
||||||
// JS has no way to express a staticly fixed size list, but dart does so we
|
// JS has no way to express a staticly fixed size list, but dart does so we
|
||||||
// keep both methods.
|
// keep both methods.
|
||||||
static createFixedSize(size): List<any> { return new List(size); }
|
static createFixedSize(size: number): List<any> { return new List(size); }
|
||||||
static createGrowableSize(size): List<any> { return new List(size); }
|
static createGrowableSize(size: number): List<any> { return new List(size); }
|
||||||
static get(m, k): any { return m[k]; }
|
static get<T>(m: List<T>, k: number): T { return m[k]; }
|
||||||
static set(m, k, v) { m[k] = v; }
|
static set<T>(m: List<T>, k: number, v: T) { m[k] = v; }
|
||||||
static clone<T>(array: List<T>): T[] { return array.slice(0); }
|
static clone<T>(array: List<T>): T[] { return array.slice(0); }
|
||||||
static map(array, fn): any { return array.map(fn); }
|
static map<T, V>(array: List<T>, fn: (T) => V): List<V> { return array.map(fn); }
|
||||||
static forEach(array: List<any>, fn: Function) {
|
static forEach<T>(array: List<T>, fn: (T) => void) {
|
||||||
for (var i = 0; i < array.length; i++) {
|
for (var i = 0; i < array.length; i++) {
|
||||||
fn(array[i]);
|
fn(array[i]);
|
||||||
}
|
}
|
||||||
@ -171,7 +171,7 @@ export class ListWrapper {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
static indexOf(array: List<any>, value, startIndex = 0): number {
|
static indexOf<T>(array: List<T>, value: T, startIndex: number = 0): number {
|
||||||
return array.indexOf(value, startIndex);
|
return array.indexOf(value, startIndex);
|
||||||
}
|
}
|
||||||
static reduce<T, E>(list: List<T>,
|
static reduce<T, E>(list: List<T>,
|
||||||
@ -186,26 +186,26 @@ export class ListWrapper {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
static contains(list: List<any>, el): boolean { return list.indexOf(el) !== -1; }
|
static contains<T>(list: List<T>, el: T): boolean { return list.indexOf(el) !== -1; }
|
||||||
static reversed<T>(array: List<T>): T[] {
|
static reversed<T>(array: List<T>): T[] {
|
||||||
var a = ListWrapper.clone(array);
|
var a = ListWrapper.clone(array);
|
||||||
return a.reverse();
|
return a.reverse();
|
||||||
}
|
}
|
||||||
static concat(a, b): List<any> { return a.concat(b); }
|
static concat(a: List<any>, b: List<any>): List<any> { return a.concat(b); }
|
||||||
static insert(list, index: int, value) { list.splice(index, 0, value); }
|
static insert<T>(list: List<T>, index: number, value: T) { list.splice(index, 0, value); }
|
||||||
static removeAt<T>(list: List<T>, index: int): T {
|
static removeAt<T>(list: List<T>, index: number): T {
|
||||||
var res = list[index];
|
var res = list[index];
|
||||||
list.splice(index, 1);
|
list.splice(index, 1);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
static removeAll(list, items) {
|
static removeAll<T>(list: List<T>, items: List<T>) {
|
||||||
for (var i = 0; i < items.length; ++i) {
|
for (var i = 0; i < items.length; ++i) {
|
||||||
var index = list.indexOf(items[i]);
|
var index = list.indexOf(items[i]);
|
||||||
list.splice(index, 1);
|
list.splice(index, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
static removeLast<T>(list: List<T>): T { return list.pop(); }
|
static removeLast<T>(list: List<T>): T { return list.pop(); }
|
||||||
static remove(list, el): boolean {
|
static remove<T>(list: List<T>, el: T): boolean {
|
||||||
var index = list.indexOf(el);
|
var index = list.indexOf(el);
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
list.splice(index, 1);
|
list.splice(index, 1);
|
||||||
@ -213,10 +213,10 @@ export class ListWrapper {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
static clear(list) { list.splice(0, list.length); }
|
static clear(list: List<any>) { list.splice(0, list.length); }
|
||||||
static join(list, s: string): string { return list.join(s); }
|
static join(list: List<any>, s: string): string { return list.join(s); }
|
||||||
static isEmpty(list): boolean { return list.length == 0; }
|
static isEmpty(list: List<any>): boolean { return list.length == 0; }
|
||||||
static fill(list: List<any>, value, start: int = 0, end: int = null) {
|
static fill(list: List<any>, value: any, start: number = 0, end: number = null) {
|
||||||
list.fill(value, start, end === null ? undefined : end);
|
list.fill(value, start, end === null ? undefined : end);
|
||||||
}
|
}
|
||||||
static equals(a: List<any>, b: List<any>): boolean {
|
static equals(a: List<any>, b: List<any>): boolean {
|
||||||
@ -226,10 +226,12 @@ export class ListWrapper {
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
static slice<T>(l: List<T>, from: int = 0, to: int = null): List<T> {
|
static slice<T>(l: List<T>, from: number = 0, to: number = null): List<T> {
|
||||||
return l.slice(from, to === null ? undefined : to);
|
return l.slice(from, to === null ? undefined : to);
|
||||||
}
|
}
|
||||||
static splice<T>(l: List<T>, from: int, length: int): List<T> { return l.splice(from, length); }
|
static splice<T>(l: List<T>, from: number, length: number): List<T> {
|
||||||
|
return l.splice(from, length);
|
||||||
|
}
|
||||||
static sort<T>(l: List<T>, compareFn?: (a: T, b: T) => number) {
|
static sort<T>(l: List<T>, compareFn?: (a: T, b: T) => number) {
|
||||||
if (isPresent(compareFn)) {
|
if (isPresent(compareFn)) {
|
||||||
l.sort(compareFn);
|
l.sort(compareFn);
|
||||||
@ -241,14 +243,14 @@ export class ListWrapper {
|
|||||||
static toJSON<T>(l: List<T>): string { return JSON.stringify(l); }
|
static toJSON<T>(l: List<T>): string { return JSON.stringify(l); }
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isListLikeIterable(obj): boolean {
|
export function isListLikeIterable(obj: any): boolean {
|
||||||
if (!isJsObject(obj)) return false;
|
if (!isJsObject(obj)) return false;
|
||||||
return isArray(obj) ||
|
return isArray(obj) ||
|
||||||
(!(obj instanceof Map) && // JS Map are iterables but return entries as [k, v]
|
(!(obj instanceof Map) && // JS Map are iterables but return entries as [k, v]
|
||||||
Symbol.iterator in obj); // JS Iterable have a Symbol.iterator prop
|
Symbol.iterator in obj); // JS Iterable have a Symbol.iterator prop
|
||||||
}
|
}
|
||||||
|
|
||||||
export function iterateListLike(obj, fn: Function) {
|
export function iterateListLike(obj: any, fn: Function) {
|
||||||
if (isArray(obj)) {
|
if (isArray(obj)) {
|
||||||
for (var i = 0; i < obj.length; i++) {
|
for (var i = 0; i < obj.length; i++) {
|
||||||
fn(obj[i]);
|
fn(obj[i]);
|
||||||
|
@ -65,35 +65,35 @@ export function IMPLEMENTS(_):<T>(target: T) => T {
|
|||||||
return (t) => t;
|
return (t) => t;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isPresent(obj): boolean {
|
export function isPresent(obj: any): boolean {
|
||||||
return obj !== undefined && obj !== null;
|
return obj !== undefined && obj !== null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isBlank(obj): boolean {
|
export function isBlank(obj: any): boolean {
|
||||||
return obj === undefined || obj === null;
|
return obj === undefined || obj === null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isString(obj): boolean {
|
export function isString(obj: any): boolean {
|
||||||
return typeof obj === "string";
|
return typeof obj === "string";
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isFunction(obj): boolean {
|
export function isFunction(obj: any): boolean {
|
||||||
return typeof obj === "function";
|
return typeof obj === "function";
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isType(obj): boolean {
|
export function isType(obj: any): boolean {
|
||||||
return isFunction(obj);
|
return isFunction(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isStringMap(obj): boolean {
|
export function isStringMap(obj: any): boolean {
|
||||||
return typeof obj === 'object' && obj !== null;
|
return typeof obj === 'object' && obj !== null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isPromise(obj): boolean {
|
export function isPromise(obj: any): boolean {
|
||||||
return obj instanceof (<any>_global).Promise;
|
return obj instanceof (<any>_global).Promise;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isArray(obj): boolean {
|
export function isArray(obj: any): boolean {
|
||||||
return Array.isArray(obj);
|
return Array.isArray(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,7 +126,7 @@ export class StringWrapper {
|
|||||||
|
|
||||||
static charCodeAt(s: string, index: int): number { return s.charCodeAt(index); }
|
static charCodeAt(s: string, index: int): number { return s.charCodeAt(index); }
|
||||||
|
|
||||||
static split(s: string, regExp): List<string> { return s.split(regExp); }
|
static split(s: string, regExp: RegExp): List<string> { return s.split(regExp); }
|
||||||
|
|
||||||
static equals(s: string, s2: string): boolean { return s === s2; }
|
static equals(s: string, s2: string): boolean { return s === s2; }
|
||||||
|
|
||||||
@ -190,7 +190,7 @@ export class NumberParseError extends BaseException {
|
|||||||
export class NumberWrapper {
|
export class NumberWrapper {
|
||||||
static toFixed(n: number, fractionDigits: int): string { return n.toFixed(fractionDigits); }
|
static toFixed(n: number, fractionDigits: int): string { return n.toFixed(fractionDigits); }
|
||||||
|
|
||||||
static equal(a, b): boolean { return a === b; }
|
static equal(a: number, b: number): boolean { return a === b; }
|
||||||
|
|
||||||
static parseIntAutoRadix(text: string): int {
|
static parseIntAutoRadix(text: string): int {
|
||||||
var result: int = parseInt(text);
|
var result: int = parseInt(text);
|
||||||
@ -224,15 +224,15 @@ export class NumberWrapper {
|
|||||||
|
|
||||||
static get NaN(): number { return NaN; }
|
static get NaN(): number { return NaN; }
|
||||||
|
|
||||||
static isNaN(value): boolean { return isNaN(value); }
|
static isNaN(value: any): boolean { return isNaN(value); }
|
||||||
|
|
||||||
static isInteger(value): boolean { return Number.isInteger(value); }
|
static isInteger(value: any): boolean { return Number.isInteger(value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
export var RegExp = _global.RegExp;
|
export var RegExp = _global.RegExp;
|
||||||
|
|
||||||
export class RegExpWrapper {
|
export class RegExpWrapper {
|
||||||
static create(regExpStr, flags: string = ''): RegExp {
|
static create(regExpStr: string, flags: string = ''): RegExp {
|
||||||
flags = flags.replace(/g/g, '');
|
flags = flags.replace(/g/g, '');
|
||||||
return new _global.RegExp(regExpStr, flags + 'g');
|
return new _global.RegExp(regExpStr, flags + 'g');
|
||||||
}
|
}
|
||||||
@ -242,7 +242,7 @@ export class RegExpWrapper {
|
|||||||
return regExp.exec(input);
|
return regExp.exec(input);
|
||||||
}
|
}
|
||||||
static test(regExp: RegExp, input: string): boolean { return regExp.test(input); }
|
static test(regExp: RegExp, input: string): boolean { return regExp.test(input); }
|
||||||
static matcher(regExp, input): {
|
static matcher(regExp: RegExp, input: string): {
|
||||||
re: RegExp;
|
re: RegExp;
|
||||||
input: string
|
input: string
|
||||||
}
|
}
|
||||||
@ -256,11 +256,16 @@ export class RegExpWrapper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class RegExpMatcherWrapper {
|
export class RegExpMatcherWrapper {
|
||||||
static next(matcher): string { return matcher.re.exec(matcher.input); }
|
static next(matcher: {
|
||||||
|
re: RegExp;
|
||||||
|
input: string
|
||||||
|
}): string[] {
|
||||||
|
return matcher.re.exec(matcher.input);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class FunctionWrapper {
|
export class FunctionWrapper {
|
||||||
static apply(fn: Function, posArgs): any { return fn.apply(null, posArgs); }
|
static apply(fn: Function, posArgs: any): any { return fn.apply(null, posArgs); }
|
||||||
}
|
}
|
||||||
|
|
||||||
// JS has NaN !== NaN
|
// JS has NaN !== NaN
|
||||||
@ -270,11 +275,11 @@ export function looseIdentical(a, b): boolean {
|
|||||||
|
|
||||||
// JS considers NaN is the same as NaN for map Key (while NaN !== NaN otherwise)
|
// JS considers NaN is the same as NaN for map Key (while NaN !== NaN otherwise)
|
||||||
// see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map
|
// see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map
|
||||||
export function getMapKey(value): any {
|
export function getMapKey<T>(value: T): T {
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function normalizeBlank(obj): any {
|
export function normalizeBlank(obj: Object): any {
|
||||||
return isBlank(obj) ? null : obj;
|
return isBlank(obj) ? null : obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -282,12 +287,12 @@ export function normalizeBool(obj: boolean): boolean {
|
|||||||
return isBlank(obj) ? false : obj;
|
return isBlank(obj) ? false : obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isJsObject(o): boolean {
|
export function isJsObject(o: any): boolean {
|
||||||
return o !== null && (typeof o === "function" || typeof o === "object");
|
return o !== null && (typeof o === "function" || typeof o === "object");
|
||||||
}
|
}
|
||||||
|
|
||||||
export function print(obj) {
|
export function print(obj: Error | Object) {
|
||||||
if (obj instanceof Error) {
|
if (obj instanceof BaseException) {
|
||||||
console.log(obj.stack);
|
console.log(obj.stack);
|
||||||
} else {
|
} else {
|
||||||
console.log(obj);
|
console.log(obj);
|
||||||
@ -297,7 +302,7 @@ export function print(obj) {
|
|||||||
// Can't be all uppercase as our transpiler would think it is a special directive...
|
// Can't be all uppercase as our transpiler would think it is a special directive...
|
||||||
export class Json {
|
export class Json {
|
||||||
static parse(s: string): Object { return _global.JSON.parse(s); }
|
static parse(s: string): Object { return _global.JSON.parse(s); }
|
||||||
static stringify(data): string {
|
static stringify(data: Object): string {
|
||||||
// Dart doesn't take 3 arguments
|
// Dart doesn't take 3 arguments
|
||||||
return _global.JSON.stringify(data, null, 2);
|
return _global.JSON.stringify(data, null, 2);
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ export class CheckboxControlValueAccessor implements ControlValueAccessor {
|
|||||||
cd.valueAccessor = this;
|
cd.valueAccessor = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
writeValue(value) { setProperty(this.renderer, this.elementRef, "checked", value); }
|
writeValue(value: any) { setProperty(this.renderer, this.elementRef, "checked", value); }
|
||||||
|
|
||||||
get ngClassUntouched(): boolean {
|
get ngClassUntouched(): boolean {
|
||||||
return isPresent(this.cd.control) ? this.cd.control.untouched : false;
|
return isPresent(this.cd.control) ? this.cd.control.untouched : false;
|
||||||
@ -54,6 +54,6 @@ export class CheckboxControlValueAccessor implements ControlValueAccessor {
|
|||||||
return isPresent(this.cd.control) ? !this.cd.control.valid : false;
|
return isPresent(this.cd.control) ? !this.cd.control.valid : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
registerOnChange(fn): void { this.onChange = fn; }
|
registerOnChange(fn: (_) => {}): void { this.onChange = fn; }
|
||||||
registerOnTouched(fn): void { this.onTouched = fn; }
|
registerOnTouched(fn: () => {}): void { this.onTouched = fn; }
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,7 @@ export class DefaultValueAccessor implements ControlValueAccessor {
|
|||||||
cd.valueAccessor = this;
|
cd.valueAccessor = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
writeValue(value) {
|
writeValue(value: any) {
|
||||||
// both this.value and setProperty are required at the moment
|
// both this.value and setProperty are required at the moment
|
||||||
// remove when a proper imperative API is provided
|
// remove when a proper imperative API is provided
|
||||||
var normalizedValue = isBlank(value) ? '' : value;
|
var normalizedValue = isBlank(value) ? '' : value;
|
||||||
@ -60,7 +60,7 @@ export class DefaultValueAccessor implements ControlValueAccessor {
|
|||||||
return isPresent(this.cd.control) ? !this.cd.control.valid : false;
|
return isPresent(this.cd.control) ? !this.cd.control.valid : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
registerOnChange(fn): void { this.onChange = fn; }
|
registerOnChange(fn: (_) => void): void { this.onChange = fn; }
|
||||||
|
|
||||||
registerOnTouched(fn): void { this.onTouched = fn; }
|
registerOnTouched(fn: () => void): void { this.onTouched = fn; }
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,7 @@ export class NgFormControl extends NgControl {
|
|||||||
this.ngValidators = ngValidators;
|
this.ngValidators = ngValidators;
|
||||||
}
|
}
|
||||||
|
|
||||||
onChange(c) {
|
onChange(c: StringMap<string, any>) {
|
||||||
if (!this._added) {
|
if (!this._added) {
|
||||||
setUpControl(this.form, this);
|
setUpControl(this.form, this);
|
||||||
this.form.updateValidity();
|
this.form.updateValidity();
|
||||||
|
@ -49,7 +49,7 @@ export class NgModel extends NgControl {
|
|||||||
this.ngValidators = ngValidators;
|
this.ngValidators = ngValidators;
|
||||||
}
|
}
|
||||||
|
|
||||||
onChange(c) {
|
onChange(c: StringMap<string, any>) {
|
||||||
if (!this._added) {
|
if (!this._added) {
|
||||||
setUpControl(this._control, this);
|
setUpControl(this._control, this);
|
||||||
this._control.updateValidity();
|
this._control.updateValidity();
|
||||||
|
@ -49,7 +49,7 @@ export class SelectControlValueAccessor implements ControlValueAccessor {
|
|||||||
this._updateValueWhenListOfOptionsChanges(query);
|
this._updateValueWhenListOfOptionsChanges(query);
|
||||||
}
|
}
|
||||||
|
|
||||||
writeValue(value) {
|
writeValue(value: any) {
|
||||||
this.value = value;
|
this.value = value;
|
||||||
setProperty(this.renderer, this.elementRef, "value", value);
|
setProperty(this.renderer, this.elementRef, "value", value);
|
||||||
}
|
}
|
||||||
@ -69,8 +69,8 @@ export class SelectControlValueAccessor implements ControlValueAccessor {
|
|||||||
return isPresent(this.cd.control) ? !this.cd.control.valid : false;
|
return isPresent(this.cd.control) ? !this.cd.control.valid : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
registerOnChange(fn): void { this.onChange = fn; }
|
registerOnChange(fn: () => any): void { this.onChange = fn; }
|
||||||
registerOnTouched(fn): void { this.onTouched = fn; }
|
registerOnTouched(fn: () => any): void { this.onTouched = fn; }
|
||||||
|
|
||||||
private _updateValueWhenListOfOptionsChanges(query: QueryList<NgSelectOption>) {
|
private _updateValueWhenListOfOptionsChanges(query: QueryList<NgSelectOption>) {
|
||||||
query.onChange(() => this.writeValue(this.value));
|
query.onChange(() => this.writeValue(this.value));
|
||||||
|
@ -22,7 +22,7 @@ function _find(c: AbstractControl, path: List<string | number>| string) {
|
|||||||
if (!(path instanceof List)) {
|
if (!(path instanceof List)) {
|
||||||
path = StringWrapper.split(<string>path, new RegExp("/"));
|
path = StringWrapper.split(<string>path, new RegExp("/"));
|
||||||
}
|
}
|
||||||
if (ListWrapper.isEmpty(path)) return null;
|
if (path instanceof List && ListWrapper.isEmpty(path)) return null;
|
||||||
|
|
||||||
return ListWrapper.reduce(<List<string | number>>path, (v, name) => {
|
return ListWrapper.reduce(<List<string | number>>path, (v, name) => {
|
||||||
if (v instanceof ControlGroup) {
|
if (v instanceof ControlGroup) {
|
||||||
@ -85,7 +85,7 @@ export class AbstractControl {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setParent(parent) { this._parent = parent; }
|
setParent(parent: ControlGroup | ControlArray) { this._parent = parent; }
|
||||||
|
|
||||||
updateValidity({onlySelf}: {onlySelf?: boolean} = {}): void {
|
updateValidity({onlySelf}: {onlySelf?: boolean} = {}): void {
|
||||||
onlySelf = isPresent(onlySelf) ? onlySelf : false;
|
onlySelf = isPresent(onlySelf) ? onlySelf : false;
|
||||||
|
@ -90,7 +90,7 @@ export class MockConnection {
|
|||||||
* returned
|
* returned
|
||||||
* from {@link Http}.
|
* from {@link Http}.
|
||||||
*/
|
*/
|
||||||
mockError(err?) {
|
mockError(err?: Error) {
|
||||||
// Matches XHR semantics
|
// Matches XHR semantics
|
||||||
this.readyState = ReadyStates.DONE;
|
this.readyState = ReadyStates.DONE;
|
||||||
ObservableWrapper.callThrow(this.response, err);
|
ObservableWrapper.callThrow(this.response, err);
|
||||||
@ -185,8 +185,8 @@ export class MockBackend {
|
|||||||
constructor() {
|
constructor() {
|
||||||
this.connectionsArray = [];
|
this.connectionsArray = [];
|
||||||
this.connections = new EventEmitter();
|
this.connections = new EventEmitter();
|
||||||
ObservableWrapper.subscribe(this.connections,
|
ObservableWrapper.subscribe<MockConnection>(
|
||||||
connection => this.connectionsArray.push(connection));
|
this.connections, connection => this.connectionsArray.push(connection));
|
||||||
this.pendingConnections = new EventEmitter();
|
this.pendingConnections = new EventEmitter();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -207,7 +207,9 @@ export class MockBackend {
|
|||||||
*
|
*
|
||||||
* This method only exists in the mock implementation, not in real Backends.
|
* This method only exists in the mock implementation, not in real Backends.
|
||||||
*/
|
*/
|
||||||
resolveAllConnections() { ObservableWrapper.subscribe(this.connections, c => c.readyState = 4); }
|
resolveAllConnections() {
|
||||||
|
ObservableWrapper.subscribe<MockConnection>(this.connections, c => c.readyState = 4);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new {@link MockConnection}. This is equivalent to calling `new
|
* Creates a new {@link MockConnection}. This is equivalent to calling `new
|
||||||
|
@ -31,7 +31,7 @@ export class Headers {
|
|||||||
if (headers instanceof Headers) {
|
if (headers instanceof Headers) {
|
||||||
this._headersMap = (<Headers>headers)._headersMap;
|
this._headersMap = (<Headers>headers)._headersMap;
|
||||||
} else if (headers instanceof StringMap) {
|
} else if (headers instanceof StringMap) {
|
||||||
this._headersMap = MapWrapper.createFromStringMap(headers);
|
this._headersMap = MapWrapper.createFromStringMap<List<string>>(headers);
|
||||||
MapWrapper.forEach(this._headersMap, (v, k) => {
|
MapWrapper.forEach(this._headersMap, (v, k) => {
|
||||||
if (!isListLikeIterable(v)) {
|
if (!isListLikeIterable(v)) {
|
||||||
var list = [];
|
var list = [];
|
||||||
|
@ -61,5 +61,5 @@ export class URLSearchParams {
|
|||||||
return ListWrapper.join(paramsList, '&');
|
return ListWrapper.join(paramsList, '&');
|
||||||
}
|
}
|
||||||
|
|
||||||
delete (param): void { MapWrapper.delete(this.paramsMap, param); }
|
delete (param: string): void { MapWrapper.delete(this.paramsMap, param); }
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@ export class SpyLocation extends SpyObject {
|
|||||||
|
|
||||||
simulateUrlPop(pathname: string) { ObservableWrapper.callNext(this._subject, {'url': pathname}); }
|
simulateUrlPop(pathname: string) { ObservableWrapper.callNext(this._subject, {'url': pathname}); }
|
||||||
|
|
||||||
normalizeAbsolutely(url): string { return this._baseHref + url; }
|
normalizeAbsolutely(url: string): string { return this._baseHref + url; }
|
||||||
|
|
||||||
go(url: string) {
|
go(url: string) {
|
||||||
url = this.normalizeAbsolutely(url);
|
url = this.normalizeAbsolutely(url);
|
||||||
@ -49,9 +49,10 @@ export class SpyLocation extends SpyObject {
|
|||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
|
|
||||||
subscribe(onNext, onThrow = null, onReturn = null) {
|
subscribe(onNext: (value: any) => void, onThrow: (error: any) => void = null,
|
||||||
|
onReturn: () => void = null) {
|
||||||
ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);
|
ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);
|
||||||
}
|
}
|
||||||
|
|
||||||
noSuchMethod(m) { super.noSuchMethod(m); }
|
noSuchMethod(m: any) { super.noSuchMethod(m); }
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@ export class MockLocationStrategy extends LocationStrategy {
|
|||||||
_subject: EventEmitter = new EventEmitter();
|
_subject: EventEmitter = new EventEmitter();
|
||||||
constructor() { super(); }
|
constructor() { super(); }
|
||||||
|
|
||||||
simulatePopState(url): void {
|
simulatePopState(url: string): void {
|
||||||
this.internalPath = url;
|
this.internalPath = url;
|
||||||
ObservableWrapper.callNext(this._subject, null);
|
ObservableWrapper.callNext(this._subject, null);
|
||||||
}
|
}
|
||||||
@ -28,7 +28,7 @@ export class MockLocationStrategy extends LocationStrategy {
|
|||||||
this.urlChanges.push(url);
|
this.urlChanges.push(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
onPopState(fn): void { ObservableWrapper.subscribe(this._subject, fn); }
|
onPopState(fn: (value: any) => void): void { ObservableWrapper.subscribe(this._subject, fn); }
|
||||||
|
|
||||||
getBaseHref(): string { return this.internalBaseHref; }
|
getBaseHref(): string { return this.internalBaseHref; }
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,7 @@ import {NgZone} from 'angular2/src/core/zone/ng_zone';
|
|||||||
export class MockNgZone extends NgZone {
|
export class MockNgZone extends NgZone {
|
||||||
constructor() { super({enableLongStackTrace: false}); }
|
constructor() { super({enableLongStackTrace: false}); }
|
||||||
|
|
||||||
run(fn): any { return fn(); }
|
run(fn: Function): any { return fn(); }
|
||||||
|
|
||||||
runOutsideAngular(fn): any { return fn(); }
|
runOutsideAngular(fn: Function): any { return fn(); }
|
||||||
}
|
}
|
||||||
|
@ -109,10 +109,10 @@ export class ReflectionCapabilities implements PlatformReflectionCapabilities {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
parameters(typeOfFunc): List<List<any>> {
|
parameters(typeOfFunc: Type): List<List<any>> {
|
||||||
// Prefer the direct API.
|
// Prefer the direct API.
|
||||||
if (isPresent(typeOfFunc.parameters)) {
|
if (isPresent((<any>typeOfFunc).parameters)) {
|
||||||
return typeOfFunc.parameters;
|
return (<any>typeOfFunc).parameters;
|
||||||
}
|
}
|
||||||
if (isPresent(this._reflect) && isPresent(this._reflect.getMetadata)) {
|
if (isPresent(this._reflect) && isPresent(this._reflect.getMetadata)) {
|
||||||
var paramAnnotations = this._reflect.getMetadata('parameters', typeOfFunc);
|
var paramAnnotations = this._reflect.getMetadata('parameters', typeOfFunc);
|
||||||
@ -121,13 +121,13 @@ export class ReflectionCapabilities implements PlatformReflectionCapabilities {
|
|||||||
return this._zipTypesAndAnnotaions(paramTypes, paramAnnotations);
|
return this._zipTypesAndAnnotaions(paramTypes, paramAnnotations);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ListWrapper.createFixedSize(typeOfFunc.length);
|
return ListWrapper.createFixedSize((<any>typeOfFunc).length);
|
||||||
}
|
}
|
||||||
|
|
||||||
annotations(typeOfFunc): List<any> {
|
annotations(typeOfFunc: Type): List<any> {
|
||||||
// Prefer the direct API.
|
// Prefer the direct API.
|
||||||
if (isPresent(typeOfFunc.annotations)) {
|
if (isPresent((<any>typeOfFunc).annotations)) {
|
||||||
var annotations = typeOfFunc.annotations;
|
var annotations = (<any>typeOfFunc).annotations;
|
||||||
if (isFunction(annotations) && annotations.annotations) {
|
if (isFunction(annotations) && annotations.annotations) {
|
||||||
annotations = annotations.annotations;
|
annotations = annotations.annotations;
|
||||||
}
|
}
|
||||||
@ -140,7 +140,9 @@ export class ReflectionCapabilities implements PlatformReflectionCapabilities {
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
interfaces(type): List<any> { throw new BaseException("JavaScript does not support interfaces"); }
|
interfaces(type: Type): List<any> {
|
||||||
|
throw new BaseException("JavaScript does not support interfaces");
|
||||||
|
}
|
||||||
|
|
||||||
getter(name: string): GetterFn { return <GetterFn>new Function('o', 'return o.' + name + ';'); }
|
getter(name: string): GetterFn { return <GetterFn>new Function('o', 'return o.' + name + ';'); }
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ export class Reflector {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
parameters(typeOrFunc): List<any> {
|
parameters(typeOrFunc: /*Type*/ any): List<any> {
|
||||||
if (this._injectableInfo.has(typeOrFunc)) {
|
if (this._injectableInfo.has(typeOrFunc)) {
|
||||||
return this._getTypeInfoField(typeOrFunc, "parameters", []);
|
return this._getTypeInfoField(typeOrFunc, "parameters", []);
|
||||||
} else {
|
} else {
|
||||||
@ -65,7 +65,7 @@ export class Reflector {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
annotations(typeOrFunc): List<any> {
|
annotations(typeOrFunc: /*Type*/ any): List<any> {
|
||||||
if (this._injectableInfo.has(typeOrFunc)) {
|
if (this._injectableInfo.has(typeOrFunc)) {
|
||||||
return this._getTypeInfoField(typeOrFunc, "annotations", []);
|
return this._getTypeInfoField(typeOrFunc, "annotations", []);
|
||||||
} else {
|
} else {
|
||||||
@ -73,7 +73,7 @@ export class Reflector {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
interfaces(type): List<any> {
|
interfaces(type: Type): List<any> {
|
||||||
if (this._injectableInfo.has(type)) {
|
if (this._injectableInfo.has(type)) {
|
||||||
return this._getTypeInfoField(type, "interfaces", []);
|
return this._getTypeInfoField(type, "interfaces", []);
|
||||||
} else {
|
} else {
|
||||||
|
@ -17,7 +17,7 @@ export class CompileControl {
|
|||||||
constructor(public _steps: List<CompileStep>) {}
|
constructor(public _steps: List<CompileStep>) {}
|
||||||
|
|
||||||
// only public so that it can be used by compile_pipeline
|
// only public so that it can be used by compile_pipeline
|
||||||
internalProcess(results: any[], startStepIndex, parent: CompileElement,
|
internalProcess(results: any[], startStepIndex: number, parent: CompileElement,
|
||||||
current: CompileElement): CompileElement[] {
|
current: CompileElement): CompileElement[] {
|
||||||
this._results = results;
|
this._results = results;
|
||||||
var previousStepIndex = this._currentStepIndex;
|
var previousStepIndex = this._currentStepIndex;
|
||||||
|
@ -17,7 +17,7 @@ export class CompilePipeline {
|
|||||||
this._control = new CompileControl(steps);
|
this._control = new CompileControl(steps);
|
||||||
}
|
}
|
||||||
|
|
||||||
process(rootElement, protoViewType: ViewType = null,
|
process(rootElement: HTMLElement, protoViewType: ViewType = null,
|
||||||
compilationCtxtDescription: string = ''): List<CompileElement> {
|
compilationCtxtDescription: string = ''): List<CompileElement> {
|
||||||
if (isBlank(protoViewType)) {
|
if (isBlank(protoViewType)) {
|
||||||
protoViewType = ViewType.COMPONENT;
|
protoViewType = ViewType.COMPONENT;
|
||||||
|
@ -36,6 +36,7 @@ export class DomCompiler extends RenderCompiler {
|
|||||||
return PromiseWrapper.then(
|
return PromiseWrapper.then(
|
||||||
tplPromise, (el) => this._compileTemplate(view, el, ViewType.COMPONENT), (e) => {
|
tplPromise, (el) => this._compileTemplate(view, el, ViewType.COMPONENT), (e) => {
|
||||||
throw new BaseException(`Failed to load the template for "${view.componentId}" : ${e}`);
|
throw new BaseException(`Failed to load the template for "${view.componentId}" : ${e}`);
|
||||||
|
return null;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -246,7 +246,7 @@ export class SelectorMatcher {
|
|||||||
* @param matchedCallback This callback will be called with the object handed into `addSelectable`
|
* @param matchedCallback This callback will be called with the object handed into `addSelectable`
|
||||||
* @return boolean true if a match was found
|
* @return boolean true if a match was found
|
||||||
*/
|
*/
|
||||||
match(cssSelector: CssSelector, matchedCallback /*: (CssSelector, any) => void*/): boolean {
|
match(cssSelector: CssSelector, matchedCallback: (CssSelector, any) => void): boolean {
|
||||||
var result = false;
|
var result = false;
|
||||||
var element = cssSelector.element;
|
var element = cssSelector.element;
|
||||||
var classNames = cssSelector.classNames;
|
var classNames = cssSelector.classNames;
|
||||||
@ -353,7 +353,7 @@ export class SelectorContext {
|
|||||||
this.notSelectors = selector.notSelectors;
|
this.notSelectors = selector.notSelectors;
|
||||||
}
|
}
|
||||||
|
|
||||||
finalize(cssSelector: CssSelector, callback /*: (CssSelector, any) => void*/): boolean {
|
finalize(cssSelector: CssSelector, callback: (CssSelector, any) => void): boolean {
|
||||||
var result = true;
|
var result = true;
|
||||||
if (this.notSelectors.length > 0 &&
|
if (this.notSelectors.length > 0 &&
|
||||||
(isBlank(this.listContext) || !this.listContext.alreadyMatched)) {
|
(isBlank(this.listContext) || !this.listContext.alreadyMatched)) {
|
||||||
|
@ -22,14 +22,15 @@ export class TextInterpolationParser implements CompileStep {
|
|||||||
for (var i = 0; i < childNodes.length; i++) {
|
for (var i = 0; i < childNodes.length; i++) {
|
||||||
var node = childNodes[i];
|
var node = childNodes[i];
|
||||||
if (DOM.isTextNode(node)) {
|
if (DOM.isTextNode(node)) {
|
||||||
var text = DOM.nodeValue(node);
|
var textNode = <Text>node;
|
||||||
|
var text = DOM.nodeValue(textNode);
|
||||||
var expr = this._parser.parseInterpolation(text, current.elementDescription);
|
var expr = this._parser.parseInterpolation(text, current.elementDescription);
|
||||||
if (isPresent(expr)) {
|
if (isPresent(expr)) {
|
||||||
DOM.setText(node, ' ');
|
DOM.setText(textNode, ' ');
|
||||||
if (current.element === current.inheritedProtoView.rootElement) {
|
if (current.element === current.inheritedProtoView.rootElement) {
|
||||||
current.inheritedProtoView.bindRootText(node, expr);
|
current.inheritedProtoView.bindRootText(textNode, expr);
|
||||||
} else {
|
} else {
|
||||||
current.bindElement().bindText(node, expr);
|
current.bindElement().bindText(textNode, expr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@ export class EventManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
addEventListener(element, eventName: string, handler: Function) {
|
addEventListener(element: HTMLElement, eventName: string, handler: Function) {
|
||||||
var withoutBubbleSymbol = this._removeBubbleSymbol(eventName);
|
var withoutBubbleSymbol = this._removeBubbleSymbol(eventName);
|
||||||
var plugin = this._findPluginFor(withoutBubbleSymbol);
|
var plugin = this._findPluginFor(withoutBubbleSymbol);
|
||||||
plugin.addEventListener(element, withoutBubbleSymbol, handler,
|
plugin.addEventListener(element, withoutBubbleSymbol, handler,
|
||||||
@ -53,11 +53,12 @@ export class EventManagerPlugin {
|
|||||||
// addEventListener methods.
|
// addEventListener methods.
|
||||||
supports(eventName: string): boolean { return false; }
|
supports(eventName: string): boolean { return false; }
|
||||||
|
|
||||||
addEventListener(element, eventName: string, handler: Function, shouldSupportBubble: boolean) {
|
addEventListener(element: HTMLElement, eventName: string, handler: Function,
|
||||||
|
shouldSupportBubble: boolean) {
|
||||||
throw "not implemented";
|
throw "not implemented";
|
||||||
}
|
}
|
||||||
|
|
||||||
addGlobalEventListener(element, eventName: string, handler: Function,
|
addGlobalEventListener(element: string, eventName: string, handler: Function,
|
||||||
shouldSupportBubble: boolean): Function {
|
shouldSupportBubble: boolean): Function {
|
||||||
throw "not implemented";
|
throw "not implemented";
|
||||||
}
|
}
|
||||||
@ -70,7 +71,8 @@ export class DomEventsPlugin extends EventManagerPlugin {
|
|||||||
// events.
|
// events.
|
||||||
supports(eventName: string): boolean { return true; }
|
supports(eventName: string): boolean { return true; }
|
||||||
|
|
||||||
addEventListener(element, eventName: string, handler: Function, shouldSupportBubble: boolean) {
|
addEventListener(element: HTMLElement, eventName: string, handler: Function,
|
||||||
|
shouldSupportBubble: boolean) {
|
||||||
var outsideHandler =
|
var outsideHandler =
|
||||||
this._getOutsideHandler(shouldSupportBubble, element, handler, this.manager._zone);
|
this._getOutsideHandler(shouldSupportBubble, element, handler, this.manager._zone);
|
||||||
this.manager._zone.runOutsideAngular(() => { DOM.on(element, eventName, outsideHandler); });
|
this.manager._zone.runOutsideAngular(() => { DOM.on(element, eventName, outsideHandler); });
|
||||||
@ -85,12 +87,14 @@ export class DomEventsPlugin extends EventManagerPlugin {
|
|||||||
() => { return DOM.onAndCancel(element, eventName, outsideHandler); });
|
() => { return DOM.onAndCancel(element, eventName, outsideHandler); });
|
||||||
}
|
}
|
||||||
|
|
||||||
_getOutsideHandler(shouldSupportBubble: boolean, element, handler: Function, zone: NgZone) {
|
_getOutsideHandler(shouldSupportBubble: boolean, element: HTMLElement, handler: Function,
|
||||||
|
zone: NgZone) {
|
||||||
return shouldSupportBubble ? DomEventsPlugin.bubbleCallback(element, handler, zone) :
|
return shouldSupportBubble ? DomEventsPlugin.bubbleCallback(element, handler, zone) :
|
||||||
DomEventsPlugin.sameElementCallback(element, handler, zone);
|
DomEventsPlugin.sameElementCallback(element, handler, zone);
|
||||||
}
|
}
|
||||||
|
|
||||||
static sameElementCallback(element, handler, zone): (event: Event) => void {
|
static sameElementCallback(element: HTMLElement, handler: Function, zone: NgZone):
|
||||||
|
(event: Event) => void {
|
||||||
return (event) => {
|
return (event) => {
|
||||||
if (event.target === element) {
|
if (event.target === element) {
|
||||||
zone.run(() => handler(event));
|
zone.run(() => handler(event));
|
||||||
@ -98,7 +102,8 @@ export class DomEventsPlugin extends EventManagerPlugin {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
static bubbleCallback(element, handler, zone): (event: Event) => void {
|
static bubbleCallback(element: HTMLElement, handler: Function, zone: NgZone):
|
||||||
|
(event: Event) => void {
|
||||||
return (event) => zone.run(() => handler(event));
|
return (event) => zone.run(() => handler(event));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,8 @@ export class HammerGesturesPlugin extends HammerGesturesPluginCommon {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
addEventListener(element, eventName: string, handler: Function, shouldSupportBubble: boolean) {
|
addEventListener(element: HTMLElement, eventName: string, handler: Function,
|
||||||
|
shouldSupportBubble: boolean) {
|
||||||
if (shouldSupportBubble)
|
if (shouldSupportBubble)
|
||||||
throw new BaseException('Hammer.js plugin does not support bubbling gestures.');
|
throw new BaseException('Hammer.js plugin does not support bubbling gestures.');
|
||||||
var zone = this.manager.getZone();
|
var zone = this.manager.getZone();
|
||||||
|
@ -9,6 +9,7 @@ import {
|
|||||||
} from 'angular2/src/facade/lang';
|
} from 'angular2/src/facade/lang';
|
||||||
import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
|
import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
|
||||||
import {EventManagerPlugin} from './event_manager';
|
import {EventManagerPlugin} from './event_manager';
|
||||||
|
import {NgZone} from 'angular2/src/core/zone/ng_zone';
|
||||||
|
|
||||||
var modifierKeys = ['alt', 'control', 'meta', 'shift'];
|
var modifierKeys = ['alt', 'control', 'meta', 'shift'];
|
||||||
var modifierKeyGetters: StringMap<string, Function> = {
|
var modifierKeyGetters: StringMap<string, Function> = {
|
||||||
@ -25,7 +26,8 @@ export class KeyEventsPlugin extends EventManagerPlugin {
|
|||||||
return isPresent(KeyEventsPlugin.parseEventName(eventName));
|
return isPresent(KeyEventsPlugin.parseEventName(eventName));
|
||||||
}
|
}
|
||||||
|
|
||||||
addEventListener(element, eventName: string, handler: Function, shouldSupportBubble: boolean) {
|
addEventListener(element: HTMLElement, eventName: string, handler: (Event: any) => any,
|
||||||
|
shouldSupportBubble: boolean) {
|
||||||
var parsedEvent = KeyEventsPlugin.parseEventName(eventName);
|
var parsedEvent = KeyEventsPlugin.parseEventName(eventName);
|
||||||
|
|
||||||
var outsideHandler = KeyEventsPlugin.eventCallback(element, shouldSupportBubble,
|
var outsideHandler = KeyEventsPlugin.eventCallback(element, shouldSupportBubble,
|
||||||
@ -68,7 +70,7 @@ export class KeyEventsPlugin extends EventManagerPlugin {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static getEventFullKey(event): string {
|
static getEventFullKey(event: Event): string {
|
||||||
var fullKey = '';
|
var fullKey = '';
|
||||||
var key = DOM.getEventKey(event);
|
var key = DOM.getEventKey(event);
|
||||||
key = key.toLowerCase();
|
key = key.toLowerCase();
|
||||||
@ -89,8 +91,8 @@ export class KeyEventsPlugin extends EventManagerPlugin {
|
|||||||
return fullKey;
|
return fullKey;
|
||||||
}
|
}
|
||||||
|
|
||||||
static eventCallback(element, shouldSupportBubble, fullKey, handler, zone):
|
static eventCallback(element: HTMLElement, shouldSupportBubble: boolean, fullKey: any,
|
||||||
(event: Event) => void {
|
handler: (Event) => any, zone: NgZone): (event: Event) => void {
|
||||||
return (event) => {
|
return (event) => {
|
||||||
var correctElement = shouldSupportBubble || event.target === element;
|
var correctElement = shouldSupportBubble || event.target === element;
|
||||||
if (correctElement && StringWrapper.equals(KeyEventsPlugin.getEventFullKey(event), fullKey)) {
|
if (correctElement && StringWrapper.equals(KeyEventsPlugin.getEventFullKey(event), fullKey)) {
|
||||||
|
@ -26,7 +26,7 @@ import {
|
|||||||
export class EmulatedScopedShadowDomStrategy extends EmulatedUnscopedShadowDomStrategy {
|
export class EmulatedScopedShadowDomStrategy extends EmulatedUnscopedShadowDomStrategy {
|
||||||
constructor(styleHost) { super(styleHost); }
|
constructor(styleHost) { super(styleHost); }
|
||||||
|
|
||||||
processStyleElement(hostComponentId: string, templateUrl: string, styleEl): void {
|
processStyleElement(hostComponentId: string, templateUrl: string, styleEl: Element): void {
|
||||||
let cssText = DOM.getText(styleEl);
|
let cssText = DOM.getText(styleEl);
|
||||||
cssText = shimCssForComponent(cssText, hostComponentId);
|
cssText = shimCssForComponent(cssText, hostComponentId);
|
||||||
DOM.setText(styleEl, cssText);
|
DOM.setText(styleEl, cssText);
|
||||||
@ -38,7 +38,7 @@ export class EmulatedScopedShadowDomStrategy extends EmulatedUnscopedShadowDomSt
|
|||||||
insertStyleElement(this.styleHost, styleEl);
|
insertStyleElement(this.styleHost, styleEl);
|
||||||
}
|
}
|
||||||
|
|
||||||
processElement(hostComponentId: string, elementComponentId: string, element): void {
|
processElement(hostComponentId: string, elementComponentId: string, element: Element): void {
|
||||||
// Shim the element as a child of the compiled component
|
// Shim the element as a child of the compiled component
|
||||||
if (isPresent(hostComponentId)) {
|
if (isPresent(hostComponentId)) {
|
||||||
var contentAttribute = getContentAttribute(getComponentId(hostComponentId));
|
var contentAttribute = getContentAttribute(getComponentId(hostComponentId));
|
||||||
|
@ -17,7 +17,7 @@ export class EmulatedUnscopedShadowDomStrategy extends ShadowDomStrategy {
|
|||||||
|
|
||||||
hasNativeContentElement(): boolean { return false; }
|
hasNativeContentElement(): boolean { return false; }
|
||||||
|
|
||||||
processStyleElement(hostComponentId: string, templateUrl: string, styleEl): void {
|
processStyleElement(hostComponentId: string, templateUrl: string, styleEl: Element): void {
|
||||||
var cssText = DOM.getText(styleEl);
|
var cssText = DOM.getText(styleEl);
|
||||||
insertSharedStyleText(cssText, this.styleHost, styleEl);
|
insertSharedStyleText(cssText, this.styleHost, styleEl);
|
||||||
}
|
}
|
||||||
|
@ -145,7 +145,7 @@ export class ShadowCss {
|
|||||||
* Shim a style element with the given selector. Returns cssText that can
|
* Shim a style element with the given selector. Returns cssText that can
|
||||||
* be included in the document via WebComponents.ShadowCSS.addCssToDocument(css).
|
* be included in the document via WebComponents.ShadowCSS.addCssToDocument(css).
|
||||||
*/
|
*/
|
||||||
shimStyle(style, selector: string, hostSelector: string = ''): string {
|
shimStyle(style: string, selector: string, hostSelector: string = ''): string {
|
||||||
var cssText = DOM.getText(style);
|
var cssText = DOM.getText(style);
|
||||||
return this.shimCssText(cssText, selector, hostSelector);
|
return this.shimCssText(cssText, selector, hostSelector);
|
||||||
}
|
}
|
||||||
|
@ -5,8 +5,9 @@ export class ShadowDomStrategy {
|
|||||||
hasNativeContentElement(): boolean { return true; }
|
hasNativeContentElement(): boolean { return true; }
|
||||||
|
|
||||||
// An optional step that can modify the template style elements.
|
// An optional step that can modify the template style elements.
|
||||||
processStyleElement(hostComponentId: string, templateUrl: string, styleElement): void {}
|
processStyleElement(hostComponentId: string, templateUrl: string, styleElement: HTMLStyleElement):
|
||||||
|
void {}
|
||||||
|
|
||||||
// An optional step that can modify the template elements (style elements exlcuded).
|
// An optional step that can modify the template elements (style elements exlcuded).
|
||||||
processElement(hostComponentId: string, elementComponentId: string, element): void {}
|
processElement(hostComponentId: string, elementComponentId: string, element: HTMLElement): void {}
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ export class ProtoViewBuilder {
|
|||||||
constructor(public rootElement, public type: api.ViewType,
|
constructor(public rootElement, public type: api.ViewType,
|
||||||
public useNativeShadowDom: boolean = false) {}
|
public useNativeShadowDom: boolean = false) {}
|
||||||
|
|
||||||
bindElement(element, description = null): ElementBinderBuilder {
|
bindElement(element: HTMLElement, description: string = null): ElementBinderBuilder {
|
||||||
var builder = new ElementBinderBuilder(this.elements.length, element, description);
|
var builder = new ElementBinderBuilder(this.elements.length, element, description);
|
||||||
this.elements.push(builder);
|
this.elements.push(builder);
|
||||||
DOM.addClass(element, NG_BINDING_CLASS);
|
DOM.addClass(element, NG_BINDING_CLASS);
|
||||||
@ -41,7 +41,7 @@ export class ProtoViewBuilder {
|
|||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
|
|
||||||
bindVariable(name, value) {
|
bindVariable(name: string, value: string) {
|
||||||
// Store the variable map from value to variable, reflecting how it will be used later by
|
// Store the variable map from value to variable, reflecting how it will be used later by
|
||||||
// DomView. When a local is set to the view, a lookup for the variable name will take place
|
// DomView. When a local is set to the view, a lookup for the variable name will take place
|
||||||
// keyed
|
// keyed
|
||||||
@ -53,7 +53,9 @@ export class ProtoViewBuilder {
|
|||||||
|
|
||||||
// Note: We don't store the node index until the compilation is complete,
|
// Note: We don't store the node index until the compilation is complete,
|
||||||
// as the compiler might change the order of elements.
|
// as the compiler might change the order of elements.
|
||||||
bindRootText(textNode, expression) { this.rootTextBindings.set(textNode, expression); }
|
bindRootText(textNode: Text, expression: ASTWithSource) {
|
||||||
|
this.rootTextBindings.set(textNode, expression);
|
||||||
|
}
|
||||||
|
|
||||||
build(): api.ProtoViewDto {
|
build(): api.ProtoViewDto {
|
||||||
var domElementBinders = [];
|
var domElementBinders = [];
|
||||||
@ -140,7 +142,7 @@ export class ElementBinderBuilder {
|
|||||||
|
|
||||||
constructor(public index: number, public element, description: string) {}
|
constructor(public index: number, public element, description: string) {}
|
||||||
|
|
||||||
setParent(parent: ElementBinderBuilder, distanceToParent): ElementBinderBuilder {
|
setParent(parent: ElementBinderBuilder, distanceToParent: number): ElementBinderBuilder {
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
if (isPresent(parent)) {
|
if (isPresent(parent)) {
|
||||||
this.distanceToParent = distanceToParent;
|
this.distanceToParent = distanceToParent;
|
||||||
@ -160,7 +162,7 @@ export class ElementBinderBuilder {
|
|||||||
return directive;
|
return directive;
|
||||||
}
|
}
|
||||||
|
|
||||||
bindNestedProtoView(rootElement): ProtoViewBuilder {
|
bindNestedProtoView(rootElement: HTMLElement): ProtoViewBuilder {
|
||||||
if (isPresent(this.nestedProtoView)) {
|
if (isPresent(this.nestedProtoView)) {
|
||||||
throw new BaseException('Only one nested view per element is allowed');
|
throw new BaseException('Only one nested view per element is allowed');
|
||||||
}
|
}
|
||||||
@ -178,7 +180,7 @@ export class ElementBinderBuilder {
|
|||||||
this.propertyBindingsToDirectives.add(name);
|
this.propertyBindingsToDirectives.add(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
bindVariable(name, value) {
|
bindVariable(name: string, value: string) {
|
||||||
// When current is a view root, the variable bindings are set to the *nested* proto view.
|
// When current is a view root, the variable bindings are set to the *nested* proto view.
|
||||||
// The root view conceptually signifies a new "block scope" (the nested view), to which
|
// The root view conceptually signifies a new "block scope" (the nested view), to which
|
||||||
// the variables are bound.
|
// the variables are bound.
|
||||||
@ -196,13 +198,15 @@ export class ElementBinderBuilder {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bindEvent(name, expression, target = null) {
|
bindEvent(name: string, expression: ASTWithSource, target: string = null) {
|
||||||
this.eventBindings.push(this.eventBuilder.add(name, expression, target));
|
this.eventBindings.push(this.eventBuilder.add(name, expression, target));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Note: We don't store the node index until the compilation is complete,
|
// Note: We don't store the node index until the compilation is complete,
|
||||||
// as the compiler might change the order of elements.
|
// as the compiler might change the order of elements.
|
||||||
bindText(textNode, expression) { this.textBindings.set(textNode, expression); }
|
bindText(textNode: Text, expression: ASTWithSource) {
|
||||||
|
this.textBindings.set(textNode, expression);
|
||||||
|
}
|
||||||
|
|
||||||
setComponentId(componentId: string) { this.componentId = componentId; }
|
setComponentId(componentId: string) { this.componentId = componentId; }
|
||||||
}
|
}
|
||||||
@ -231,7 +235,7 @@ export class DirectiveBuilder {
|
|||||||
this.hostPropertyBindings.set(name, expression);
|
this.hostPropertyBindings.set(name, expression);
|
||||||
}
|
}
|
||||||
|
|
||||||
bindEvent(name, expression, target = null) {
|
bindEvent(name: string, expression: ASTWithSource, target: string = null) {
|
||||||
this.eventBindings.push(this.eventBuilder.add(name, expression, target));
|
this.eventBindings.push(this.eventBuilder.add(name, expression, target));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -67,7 +67,7 @@ export class DomView {
|
|||||||
|
|
||||||
setText(textIndex: number, value: string) { DOM.setText(this.boundTextNodes[textIndex], value); }
|
setText(textIndex: number, value: string) { DOM.setText(this.boundTextNodes[textIndex], value); }
|
||||||
|
|
||||||
dispatchEvent(elementIndex, eventName, event): boolean {
|
dispatchEvent(elementIndex: number, eventName: string, event: Event): boolean {
|
||||||
var allowDefaultBehavior = true;
|
var allowDefaultBehavior = true;
|
||||||
if (isPresent(this.eventDispatcher)) {
|
if (isPresent(this.eventDispatcher)) {
|
||||||
var evalLocals = new Map();
|
var evalLocals = new Map();
|
||||||
|
@ -72,7 +72,8 @@ export class Location {
|
|||||||
|
|
||||||
back(): void { this._platformStrategy.back(); }
|
back(): void { this._platformStrategy.back(); }
|
||||||
|
|
||||||
subscribe(onNext, onThrow = null, onReturn = null): void {
|
subscribe(onNext: (value: any) => void, onThrow: (exception: any) => void = null,
|
||||||
|
onReturn: () => void = null): void {
|
||||||
ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);
|
ObservableWrapper.subscribe(this._subject, onNext, onThrow, onReturn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,6 @@ export class LocationStrategy {
|
|||||||
pushState(ctx: any, title: string, url: string): void { throw _abstract(); }
|
pushState(ctx: any, title: string, url: string): void { throw _abstract(); }
|
||||||
forward(): void { throw _abstract(); }
|
forward(): void { throw _abstract(); }
|
||||||
back(): void { throw _abstract(); }
|
back(): void { throw _abstract(); }
|
||||||
onPopState(fn): void { throw _abstract(); }
|
onPopState(fn: (_) => any): void { throw _abstract(); }
|
||||||
getBaseHref(): string { throw _abstract(); }
|
getBaseHref(): string { throw _abstract(); }
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ export class RouteRegistry {
|
|||||||
/**
|
/**
|
||||||
* Given a component and a configuration object, add the route to this registry
|
* Given a component and a configuration object, add the route to this registry
|
||||||
*/
|
*/
|
||||||
config(parentComponent, config: RouteDefinition): void {
|
config(parentComponent: any, config: RouteDefinition): void {
|
||||||
config = normalizeRouteConfig(config);
|
config = normalizeRouteConfig(config);
|
||||||
|
|
||||||
var recognizer: RouteRecognizer = this._rules.get(parentComponent);
|
var recognizer: RouteRecognizer = this._rules.get(parentComponent);
|
||||||
@ -61,7 +61,7 @@ export class RouteRegistry {
|
|||||||
/**
|
/**
|
||||||
* Reads the annotations of a component and configures the registry based on them
|
* Reads the annotations of a component and configures the registry based on them
|
||||||
*/
|
*/
|
||||||
configFromComponent(component): void {
|
configFromComponent(component: any): void {
|
||||||
if (!isType(component)) {
|
if (!isType(component)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -88,7 +88,7 @@ export class RouteRegistry {
|
|||||||
* Given a URL and a parent component, return the most specific instruction for navigating
|
* Given a URL and a parent component, return the most specific instruction for navigating
|
||||||
* the application into the state specified by the url
|
* the application into the state specified by the url
|
||||||
*/
|
*/
|
||||||
recognize(url: string, parentComponent): Promise<Instruction> {
|
recognize(url: string, parentComponent: any): Promise<Instruction> {
|
||||||
var componentRecognizer = this._rules.get(parentComponent);
|
var componentRecognizer = this._rules.get(parentComponent);
|
||||||
if (isBlank(componentRecognizer)) {
|
if (isBlank(componentRecognizer)) {
|
||||||
return PromiseWrapper.resolve(null);
|
return PromiseWrapper.resolve(null);
|
||||||
@ -142,7 +142,7 @@ export class RouteRegistry {
|
|||||||
* Given a normalized list with component names and params like: `['user', {id: 3 }]`
|
* Given a normalized list with component names and params like: `['user', {id: 3 }]`
|
||||||
* generates a url with a leading slash relative to the provided `parentComponent`.
|
* generates a url with a leading slash relative to the provided `parentComponent`.
|
||||||
*/
|
*/
|
||||||
generate(linkParams: List<any>, parentComponent): string {
|
generate(linkParams: List<any>, parentComponent: any): string {
|
||||||
let url = '';
|
let url = '';
|
||||||
let componentCursor = parentComponent;
|
let componentCursor = parentComponent;
|
||||||
for (let i = 0; i < linkParams.length; i += 1) {
|
for (let i = 0; i < linkParams.length; i += 1) {
|
||||||
|
@ -196,7 +196,9 @@ export class Router {
|
|||||||
/**
|
/**
|
||||||
* Subscribe to URL updates from the router
|
* Subscribe to URL updates from the router
|
||||||
*/
|
*/
|
||||||
subscribe(onNext): void { ObservableWrapper.subscribe(this._subject, onNext); }
|
subscribe(onNext: (value: any) => void): void {
|
||||||
|
ObservableWrapper.subscribe(this._subject, onNext);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -292,7 +294,7 @@ export class RootRouter extends Router {
|
|||||||
this.navigate(location.path());
|
this.navigate(location.path());
|
||||||
}
|
}
|
||||||
|
|
||||||
commit(instruction): Promise<any> {
|
commit(instruction: Instruction): Promise<any> {
|
||||||
return super.commit(instruction)
|
return super.commit(instruction)
|
||||||
.then((_) => { this._location.go(instruction.accumulatedUrl); });
|
.then((_) => { this._location.go(instruction.accumulatedUrl); });
|
||||||
}
|
}
|
||||||
|
@ -20,8 +20,8 @@ export function dispatchEvent(element, eventType) {
|
|||||||
DOM.dispatchEvent(element, DOM.createEvent(eventType));
|
DOM.dispatchEvent(element, DOM.createEvent(eventType));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function el(html: string) {
|
export function el(html: string): HTMLElement {
|
||||||
return DOM.firstChild(DOM.content(DOM.createTemplate(html)));
|
return <HTMLElement>DOM.firstChild(DOM.content(DOM.createTemplate(html)));
|
||||||
}
|
}
|
||||||
|
|
||||||
var _RE_SPECIAL_CHARS =
|
var _RE_SPECIAL_CHARS =
|
||||||
|
@ -42,7 +42,7 @@ export class Serializer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TODO: template this to return the type that is passed if possible
|
// TODO: template this to return the type that is passed if possible
|
||||||
static deserialize(map, type: Type, data?): any {
|
static deserialize(map: List<any>, type: Type, data?: any): any {
|
||||||
if (!isPresent(map)) {
|
if (!isPresent(map)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@ -69,7 +69,7 @@ export class Serializer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static mapToObject(map, type?: Type): Object {
|
static mapToObject(map: Map<any, any>, type?: Type): Object {
|
||||||
var object = {};
|
var object = {};
|
||||||
var serialize = isPresent(type);
|
var serialize = isPresent(type);
|
||||||
|
|
||||||
@ -88,7 +88,7 @@ export class Serializer {
|
|||||||
* If the values need to be deserialized pass in their type
|
* If the values need to be deserialized pass in their type
|
||||||
* and they will be deserialized before being placed in the map
|
* and they will be deserialized before being placed in the map
|
||||||
*/
|
*/
|
||||||
static objectToMap(obj, type?: Type, data?): Map<string, any> {
|
static objectToMap(obj: Object, type?: Type, data?: any): Map<string, any> {
|
||||||
if (isPresent(type)) {
|
if (isPresent(type)) {
|
||||||
var map: Map<string, any> = new Map();
|
var map: Map<string, any> = new Map();
|
||||||
StringMapWrapper.forEach(
|
StringMapWrapper.forEach(
|
||||||
@ -142,7 +142,7 @@ class ViewDefinitionSerializer {
|
|||||||
'styles': view.styles
|
'styles': view.styles
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
static deserialize(obj): ViewDefinition {
|
static deserialize(obj: any): ViewDefinition {
|
||||||
return new ViewDefinition({
|
return new ViewDefinition({
|
||||||
componentId: obj.componentId,
|
componentId: obj.componentId,
|
||||||
templateAbsUrl: obj.templateAbsUrl, template: obj.template,
|
templateAbsUrl: obj.templateAbsUrl, template: obj.template,
|
||||||
@ -164,7 +164,7 @@ class DirectiveBinderSerializer {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
static deserialize(obj): DirectiveBinder {
|
static deserialize(obj: any): DirectiveBinder {
|
||||||
return new DirectiveBinder({
|
return new DirectiveBinder({
|
||||||
directiveIndex: obj.directiveIndex,
|
directiveIndex: obj.directiveIndex,
|
||||||
propertyBindings: Serializer.objectToMap(obj.propertyBindings, ASTWithSource, "binding"),
|
propertyBindings: Serializer.objectToMap(obj.propertyBindings, ASTWithSource, "binding"),
|
||||||
@ -189,7 +189,7 @@ class ElementBinderSerializer {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
static deserialize(obj): ElementBinder {
|
static deserialize(obj: any): ElementBinder {
|
||||||
return new ElementBinder({
|
return new ElementBinder({
|
||||||
index: obj.index,
|
index: obj.index,
|
||||||
parentIndex: obj.parentIndex,
|
parentIndex: obj.parentIndex,
|
||||||
@ -216,7 +216,7 @@ class ProtoViewDtoSerializer {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
static deserialize(obj): ProtoViewDto {
|
static deserialize(obj: any): ProtoViewDto {
|
||||||
return new ProtoViewDto({
|
return new ProtoViewDto({
|
||||||
render: null, // TODO: fix render refs and write a serializer for them
|
render: null, // TODO: fix render refs and write a serializer for them
|
||||||
elementBinders: Serializer.deserialize(obj.elementBinders, ElementBinder),
|
elementBinders: Serializer.deserialize(obj.elementBinders, ElementBinder),
|
||||||
@ -250,7 +250,7 @@ class DirectiveMetadataSerializer {
|
|||||||
};
|
};
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
static deserialize(obj): DirectiveMetadata {
|
static deserialize(obj: any): DirectiveMetadata {
|
||||||
return new DirectiveMetadata({
|
return new DirectiveMetadata({
|
||||||
id: obj.id,
|
id: obj.id,
|
||||||
selector: obj.selector,
|
selector: obj.selector,
|
||||||
|
@ -207,7 +207,7 @@ export function main() {
|
|||||||
let l = [NumberWrapper.NaN, NumberWrapper.NaN];
|
let l = [NumberWrapper.NaN, NumberWrapper.NaN];
|
||||||
changes.check(l);
|
changes.check(l);
|
||||||
|
|
||||||
ListWrapper.insert(l, 0, 'foo');
|
ListWrapper.insert<any>(l, 0, 'foo');
|
||||||
changes.check(l);
|
changes.check(l);
|
||||||
expect(changes.toString())
|
expect(changes.toString())
|
||||||
.toEqual(iterableChangesAsString({
|
.toEqual(iterableChangesAsString({
|
||||||
|
@ -76,8 +76,10 @@ export function main() {
|
|||||||
describe("createDirectiveVariableBindings", () => {
|
describe("createDirectiveVariableBindings", () => {
|
||||||
it("should calculate directive variable bindings", () => {
|
it("should calculate directive variable bindings", () => {
|
||||||
var dvbs = createDirectiveVariableBindings(
|
var dvbs = createDirectiveVariableBindings(
|
||||||
new renderApi.ElementBinder(
|
new renderApi.ElementBinder({
|
||||||
{variableBindings: MapWrapper.createFromStringMap({"exportName": "templateName"})}),
|
variableBindings:
|
||||||
|
MapWrapper.createFromStringMap<string>({"exportName": "templateName"})
|
||||||
|
}),
|
||||||
[
|
[
|
||||||
directiveBinding(
|
directiveBinding(
|
||||||
{metadata: renderApi.DirectiveMetadata.create({exportAs: 'exportName'})}),
|
{metadata: renderApi.DirectiveMetadata.create({exportAs: 'exportName'})}),
|
||||||
@ -85,13 +87,15 @@ export function main() {
|
|||||||
{metadata: renderApi.DirectiveMetadata.create({exportAs: 'otherName'})})
|
{metadata: renderApi.DirectiveMetadata.create({exportAs: 'otherName'})})
|
||||||
]);
|
]);
|
||||||
|
|
||||||
expect(dvbs).toEqual(MapWrapper.createFromStringMap({"templateName": 0}));
|
expect(dvbs).toEqual(MapWrapper.createFromStringMap<number>({"templateName": 0}));
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should set exportAs to $implicit for component with exportAs = null", () => {
|
it("should set exportAs to $implicit for component with exportAs = null", () => {
|
||||||
var dvbs = createDirectiveVariableBindings(
|
var dvbs = createDirectiveVariableBindings(
|
||||||
new renderApi.ElementBinder(
|
new renderApi.ElementBinder({
|
||||||
{variableBindings: MapWrapper.createFromStringMap({"$implicit": "templateName"})}),
|
variableBindings:
|
||||||
|
MapWrapper.createFromStringMap<string>({"$implicit": "templateName"})
|
||||||
|
}),
|
||||||
[
|
[
|
||||||
directiveBinding({
|
directiveBinding({
|
||||||
metadata: renderApi.DirectiveMetadata.create(
|
metadata: renderApi.DirectiveMetadata.create(
|
||||||
@ -99,7 +103,7 @@ export function main() {
|
|||||||
})
|
})
|
||||||
]);
|
]);
|
||||||
|
|
||||||
expect(dvbs).toEqual(MapWrapper.createFromStringMap({"templateName": 0}));
|
expect(dvbs).toEqual(MapWrapper.createFromStringMap<number>({"templateName": 0}));
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should throw we no directive exported with this name", () => {
|
it("should throw we no directive exported with this name", () => {
|
||||||
@ -107,7 +111,7 @@ export function main() {
|
|||||||
createDirectiveVariableBindings(
|
createDirectiveVariableBindings(
|
||||||
new renderApi.ElementBinder({
|
new renderApi.ElementBinder({
|
||||||
variableBindings:
|
variableBindings:
|
||||||
MapWrapper.createFromStringMap({"someInvalidName": "templateName"})
|
MapWrapper.createFromStringMap<string>({"someInvalidName": "templateName"})
|
||||||
}),
|
}),
|
||||||
[
|
[
|
||||||
directiveBinding(
|
directiveBinding(
|
||||||
@ -120,7 +124,8 @@ export function main() {
|
|||||||
expect(() => {
|
expect(() => {
|
||||||
createDirectiveVariableBindings(
|
createDirectiveVariableBindings(
|
||||||
new renderApi.ElementBinder({
|
new renderApi.ElementBinder({
|
||||||
variableBindings: MapWrapper.createFromStringMap({"exportName": "templateName"})
|
variableBindings:
|
||||||
|
MapWrapper.createFromStringMap<string>({"exportName": "templateName"})
|
||||||
}),
|
}),
|
||||||
[
|
[
|
||||||
directiveBinding(
|
directiveBinding(
|
||||||
@ -148,11 +153,11 @@ export function main() {
|
|||||||
it('should merge the names in the template for all ElementBinders', () => {
|
it('should merge the names in the template for all ElementBinders', () => {
|
||||||
expect(createVariableLocations([
|
expect(createVariableLocations([
|
||||||
new renderApi.ElementBinder(
|
new renderApi.ElementBinder(
|
||||||
{variableBindings: MapWrapper.createFromStringMap({"x": "a"})}),
|
{variableBindings: MapWrapper.createFromStringMap<string>({"x": "a"})}),
|
||||||
new renderApi.ElementBinder(
|
new renderApi.ElementBinder(
|
||||||
{variableBindings: MapWrapper.createFromStringMap({"y": "b"})})
|
{variableBindings: MapWrapper.createFromStringMap<string>({"y": "b"})})
|
||||||
|
|
||||||
])).toEqual(MapWrapper.createFromStringMap({'a': 0, 'b': 1}));
|
])).toEqual(MapWrapper.createFromStringMap<number>({'a': 0, 'b': 1}));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -206,7 +206,7 @@ export function main() {
|
|||||||
var injector = createInjector([
|
var injector = createInjector([
|
||||||
bind('originalEngine')
|
bind('originalEngine')
|
||||||
.toClass(forwardRef(() => Engine)),
|
.toClass(forwardRef(() => Engine)),
|
||||||
bind('aliasedEngine').toAlias(forwardRef(() => 'originalEngine'))
|
bind('aliasedEngine').toAlias(<any>forwardRef(() => 'originalEngine'))
|
||||||
]);
|
]);
|
||||||
expect(injector.get('aliasedEngine')).toBeAnInstanceOf(Engine);
|
expect(injector.get('aliasedEngine')).toBeAnInstanceOf(Engine);
|
||||||
});
|
});
|
||||||
|
@ -18,6 +18,7 @@ import {bind, Injector} from 'angular2/di';
|
|||||||
import {isPresent, StringWrapper} from 'angular2/src/facade/lang';
|
import {isPresent, StringWrapper} from 'angular2/src/facade/lang';
|
||||||
import {TimerWrapper} from 'angular2/src/facade/async';
|
import {TimerWrapper} from 'angular2/src/facade/async';
|
||||||
import {Request} from 'angular2/src/http/static_request';
|
import {Request} from 'angular2/src/http/static_request';
|
||||||
|
import {Response} from 'angular2/src/http/static_response';
|
||||||
import {Map} from 'angular2/src/facade/collection';
|
import {Map} from 'angular2/src/facade/collection';
|
||||||
import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options';
|
import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options';
|
||||||
import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options';
|
import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options';
|
||||||
@ -25,6 +26,7 @@ import {ResponseTypes, ReadyStates, RequestMethods} from 'angular2/src/http/enum
|
|||||||
|
|
||||||
var addEventListenerSpy;
|
var addEventListenerSpy;
|
||||||
var existingScripts = [];
|
var existingScripts = [];
|
||||||
|
var unused: Response;
|
||||||
|
|
||||||
class MockBrowserJsonp extends BrowserJsonp {
|
class MockBrowserJsonp extends BrowserJsonp {
|
||||||
src: string;
|
src: string;
|
||||||
@ -87,7 +89,7 @@ export function main() {
|
|||||||
inject([AsyncTestCompleter], async => {
|
inject([AsyncTestCompleter], async => {
|
||||||
let connection = new JSONPConnection(sampleRequest, new MockBrowserJsonp(),
|
let connection = new JSONPConnection(sampleRequest, new MockBrowserJsonp(),
|
||||||
new ResponseOptions({type: ResponseTypes.Error}));
|
new ResponseOptions({type: ResponseTypes.Error}));
|
||||||
ObservableWrapper.subscribe(connection.response, res => {
|
ObservableWrapper.subscribe<Response>(connection.response, res => {
|
||||||
expect(res.type).toBe(ResponseTypes.Error);
|
expect(res.type).toBe(ResponseTypes.Error);
|
||||||
async.done();
|
async.done();
|
||||||
});
|
});
|
||||||
@ -164,7 +166,7 @@ export function main() {
|
|||||||
it('should respond with data passed to callback', inject([AsyncTestCompleter], async => {
|
it('should respond with data passed to callback', inject([AsyncTestCompleter], async => {
|
||||||
let connection = new JSONPConnection(sampleRequest, new MockBrowserJsonp());
|
let connection = new JSONPConnection(sampleRequest, new MockBrowserJsonp());
|
||||||
|
|
||||||
ObservableWrapper.subscribe(connection.response, res => {
|
ObservableWrapper.subscribe<Response>(connection.response, res => {
|
||||||
expect(res.json()).toEqual(({fake_payload: true, blob_id: 12345}));
|
expect(res.json()).toEqual(({fake_payload: true, blob_id: 12345}));
|
||||||
async.done();
|
async.done();
|
||||||
});
|
});
|
||||||
|
@ -16,6 +16,7 @@ import {BrowserXhr} from 'angular2/src/http/backends/browser_xhr';
|
|||||||
import {XHRConnection, XHRBackend} from 'angular2/src/http/backends/xhr_backend';
|
import {XHRConnection, XHRBackend} from 'angular2/src/http/backends/xhr_backend';
|
||||||
import {bind, Injector} from 'angular2/di';
|
import {bind, Injector} from 'angular2/di';
|
||||||
import {Request} from 'angular2/src/http/static_request';
|
import {Request} from 'angular2/src/http/static_request';
|
||||||
|
import {Response} from 'angular2/src/http/static_response';
|
||||||
import {Headers} from 'angular2/src/http/headers';
|
import {Headers} from 'angular2/src/http/headers';
|
||||||
import {Map} from 'angular2/src/facade/collection';
|
import {Map} from 'angular2/src/facade/collection';
|
||||||
import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options';
|
import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options';
|
||||||
@ -28,6 +29,7 @@ var openSpy;
|
|||||||
var setRequestHeaderSpy;
|
var setRequestHeaderSpy;
|
||||||
var addEventListenerSpy;
|
var addEventListenerSpy;
|
||||||
var existingXHRs = [];
|
var existingXHRs = [];
|
||||||
|
var unused: Response;
|
||||||
|
|
||||||
class MockBrowserXHR extends BrowserXhr {
|
class MockBrowserXHR extends BrowserXhr {
|
||||||
abort: any;
|
abort: any;
|
||||||
@ -86,7 +88,7 @@ export function main() {
|
|||||||
inject([AsyncTestCompleter], async => {
|
inject([AsyncTestCompleter], async => {
|
||||||
var connection = new XHRConnection(sampleRequest, new MockBrowserXHR(),
|
var connection = new XHRConnection(sampleRequest, new MockBrowserXHR(),
|
||||||
new ResponseOptions({type: ResponseTypes.Error}));
|
new ResponseOptions({type: ResponseTypes.Error}));
|
||||||
ObservableWrapper.subscribe(connection.response, res => {
|
ObservableWrapper.subscribe<Response>(connection.response, res => {
|
||||||
expect(res.type).toBe(ResponseTypes.Error);
|
expect(res.type).toBe(ResponseTypes.Error);
|
||||||
async.done();
|
async.done();
|
||||||
});
|
});
|
||||||
|
@ -13,7 +13,7 @@ import {
|
|||||||
} from 'angular2/test_lib';
|
} from 'angular2/test_lib';
|
||||||
import {Http} from 'angular2/src/http/http';
|
import {Http} from 'angular2/src/http/http';
|
||||||
import {Injector, bind} from 'angular2/di';
|
import {Injector, bind} from 'angular2/di';
|
||||||
import {MockBackend} from 'angular2/src/http/backends/mock_backend';
|
import {MockBackend, MockConnection} from 'angular2/src/http/backends/mock_backend';
|
||||||
import {Response} from 'angular2/src/http/static_response';
|
import {Response} from 'angular2/src/http/static_response';
|
||||||
import {RequestMethods} from 'angular2/src/http/enums';
|
import {RequestMethods} from 'angular2/src/http/enums';
|
||||||
import {BaseRequestOptions, RequestOptions} from 'angular2/src/http/base_request_options';
|
import {BaseRequestOptions, RequestOptions} from 'angular2/src/http/base_request_options';
|
||||||
@ -66,7 +66,7 @@ export function main() {
|
|||||||
|
|
||||||
it('should accept a fully-qualified request as its only parameter',
|
it('should accept a fully-qualified request as its only parameter',
|
||||||
inject([AsyncTestCompleter], (async) => {
|
inject([AsyncTestCompleter], (async) => {
|
||||||
ObservableWrapper.subscribe(backend.connections, c => {
|
ObservableWrapper.subscribe<MockConnection>(backend.connections, c => {
|
||||||
expect(c.request.url).toBe('https://google.com');
|
expect(c.request.url).toBe('https://google.com');
|
||||||
c.mockRespond(new Response(new ResponseOptions({body: 'Thank you'})));
|
c.mockRespond(new Response(new ResponseOptions({body: 'Thank you'})));
|
||||||
async.done();
|
async.done();
|
||||||
@ -79,8 +79,9 @@ export function main() {
|
|||||||
|
|
||||||
it('should perform a get request for given url if only passed a string',
|
it('should perform a get request for given url if only passed a string',
|
||||||
inject([AsyncTestCompleter], (async) => {
|
inject([AsyncTestCompleter], (async) => {
|
||||||
ObservableWrapper.subscribe(backend.connections, c => c.mockRespond(baseResponse));
|
ObservableWrapper.subscribe<MockConnection>(backend.connections,
|
||||||
ObservableWrapper.subscribe(http.request('http://basic.connection'), res => {
|
c => c.mockRespond(baseResponse));
|
||||||
|
ObservableWrapper.subscribe<Response>(http.request('http://basic.connection'), res => {
|
||||||
expect(res.text()).toBe('base response');
|
expect(res.text()).toBe('base response');
|
||||||
async.done();
|
async.done();
|
||||||
});
|
});
|
||||||
@ -102,7 +103,7 @@ export function main() {
|
|||||||
|
|
||||||
describe('.get()', () => {
|
describe('.get()', () => {
|
||||||
it('should perform a get request for given url', inject([AsyncTestCompleter], async => {
|
it('should perform a get request for given url', inject([AsyncTestCompleter], async => {
|
||||||
ObservableWrapper.subscribe(backend.connections, c => {
|
ObservableWrapper.subscribe<MockConnection>(backend.connections, c => {
|
||||||
expect(c.request.method).toBe(RequestMethods.GET);
|
expect(c.request.method).toBe(RequestMethods.GET);
|
||||||
backend.resolveAllConnections();
|
backend.resolveAllConnections();
|
||||||
async.done();
|
async.done();
|
||||||
@ -114,7 +115,7 @@ export function main() {
|
|||||||
|
|
||||||
describe('.post()', () => {
|
describe('.post()', () => {
|
||||||
it('should perform a post request for given url', inject([AsyncTestCompleter], async => {
|
it('should perform a post request for given url', inject([AsyncTestCompleter], async => {
|
||||||
ObservableWrapper.subscribe(backend.connections, c => {
|
ObservableWrapper.subscribe<MockConnection>(backend.connections, c => {
|
||||||
expect(c.request.method).toBe(RequestMethods.POST);
|
expect(c.request.method).toBe(RequestMethods.POST);
|
||||||
backend.resolveAllConnections();
|
backend.resolveAllConnections();
|
||||||
async.done();
|
async.done();
|
||||||
@ -125,7 +126,7 @@ export function main() {
|
|||||||
|
|
||||||
it('should attach the provided body to the request', inject([AsyncTestCompleter], async => {
|
it('should attach the provided body to the request', inject([AsyncTestCompleter], async => {
|
||||||
var body = 'this is my post body';
|
var body = 'this is my post body';
|
||||||
ObservableWrapper.subscribe(backend.connections, c => {
|
ObservableWrapper.subscribe<MockConnection>(backend.connections, c => {
|
||||||
expect(c.request.text()).toBe(body);
|
expect(c.request.text()).toBe(body);
|
||||||
backend.resolveAllConnections();
|
backend.resolveAllConnections();
|
||||||
async.done();
|
async.done();
|
||||||
@ -137,7 +138,7 @@ export function main() {
|
|||||||
|
|
||||||
describe('.put()', () => {
|
describe('.put()', () => {
|
||||||
it('should perform a put request for given url', inject([AsyncTestCompleter], async => {
|
it('should perform a put request for given url', inject([AsyncTestCompleter], async => {
|
||||||
ObservableWrapper.subscribe(backend.connections, c => {
|
ObservableWrapper.subscribe<MockConnection>(backend.connections, c => {
|
||||||
expect(c.request.method).toBe(RequestMethods.PUT);
|
expect(c.request.method).toBe(RequestMethods.PUT);
|
||||||
backend.resolveAllConnections();
|
backend.resolveAllConnections();
|
||||||
async.done();
|
async.done();
|
||||||
@ -147,7 +148,7 @@ export function main() {
|
|||||||
|
|
||||||
it('should attach the provided body to the request', inject([AsyncTestCompleter], async => {
|
it('should attach the provided body to the request', inject([AsyncTestCompleter], async => {
|
||||||
var body = 'this is my put body';
|
var body = 'this is my put body';
|
||||||
ObservableWrapper.subscribe(backend.connections, c => {
|
ObservableWrapper.subscribe<MockConnection>(backend.connections, c => {
|
||||||
expect(c.request.text()).toBe(body);
|
expect(c.request.text()).toBe(body);
|
||||||
backend.resolveAllConnections();
|
backend.resolveAllConnections();
|
||||||
async.done();
|
async.done();
|
||||||
@ -159,7 +160,7 @@ export function main() {
|
|||||||
|
|
||||||
describe('.delete()', () => {
|
describe('.delete()', () => {
|
||||||
it('should perform a delete request for given url', inject([AsyncTestCompleter], async => {
|
it('should perform a delete request for given url', inject([AsyncTestCompleter], async => {
|
||||||
ObservableWrapper.subscribe(backend.connections, c => {
|
ObservableWrapper.subscribe<MockConnection>(backend.connections, c => {
|
||||||
expect(c.request.method).toBe(RequestMethods.DELETE);
|
expect(c.request.method).toBe(RequestMethods.DELETE);
|
||||||
backend.resolveAllConnections();
|
backend.resolveAllConnections();
|
||||||
async.done();
|
async.done();
|
||||||
@ -171,7 +172,7 @@ export function main() {
|
|||||||
|
|
||||||
describe('.patch()', () => {
|
describe('.patch()', () => {
|
||||||
it('should perform a patch request for given url', inject([AsyncTestCompleter], async => {
|
it('should perform a patch request for given url', inject([AsyncTestCompleter], async => {
|
||||||
ObservableWrapper.subscribe(backend.connections, c => {
|
ObservableWrapper.subscribe<MockConnection>(backend.connections, c => {
|
||||||
expect(c.request.method).toBe(RequestMethods.PATCH);
|
expect(c.request.method).toBe(RequestMethods.PATCH);
|
||||||
backend.resolveAllConnections();
|
backend.resolveAllConnections();
|
||||||
async.done();
|
async.done();
|
||||||
@ -181,7 +182,7 @@ export function main() {
|
|||||||
|
|
||||||
it('should attach the provided body to the request', inject([AsyncTestCompleter], async => {
|
it('should attach the provided body to the request', inject([AsyncTestCompleter], async => {
|
||||||
var body = 'this is my patch body';
|
var body = 'this is my patch body';
|
||||||
ObservableWrapper.subscribe(backend.connections, c => {
|
ObservableWrapper.subscribe<MockConnection>(backend.connections, c => {
|
||||||
expect(c.request.text()).toBe(body);
|
expect(c.request.text()).toBe(body);
|
||||||
backend.resolveAllConnections();
|
backend.resolveAllConnections();
|
||||||
async.done();
|
async.done();
|
||||||
@ -193,7 +194,7 @@ export function main() {
|
|||||||
|
|
||||||
describe('.head()', () => {
|
describe('.head()', () => {
|
||||||
it('should perform a head request for given url', inject([AsyncTestCompleter], async => {
|
it('should perform a head request for given url', inject([AsyncTestCompleter], async => {
|
||||||
ObservableWrapper.subscribe(backend.connections, c => {
|
ObservableWrapper.subscribe<MockConnection>(backend.connections, c => {
|
||||||
expect(c.request.method).toBe(RequestMethods.HEAD);
|
expect(c.request.method).toBe(RequestMethods.HEAD);
|
||||||
backend.resolveAllConnections();
|
backend.resolveAllConnections();
|
||||||
async.done();
|
async.done();
|
||||||
|
@ -232,25 +232,27 @@ var someDirectiveWithProps = DirectiveMetadata.create({
|
|||||||
|
|
||||||
var someDirectiveWithHostProperties = DirectiveMetadata.create({
|
var someDirectiveWithHostProperties = DirectiveMetadata.create({
|
||||||
selector: '[some-decor-with-host-props]',
|
selector: '[some-decor-with-host-props]',
|
||||||
host: MapWrapper.createFromStringMap({'[hostProp]': 'dirProp'})
|
host: MapWrapper.createFromStringMap<string>({'[hostProp]': 'dirProp'})
|
||||||
});
|
});
|
||||||
|
|
||||||
var someDirectiveWithInvalidHostProperties = DirectiveMetadata.create({
|
var someDirectiveWithInvalidHostProperties = DirectiveMetadata.create({
|
||||||
selector: '[some-decor-with-invalid-host-props]',
|
selector: '[some-decor-with-invalid-host-props]',
|
||||||
host: MapWrapper.createFromStringMap({'[hostProp]': 'dirProp + dirProp2'})
|
host: MapWrapper.createFromStringMap<string>({'[hostProp]': 'dirProp + dirProp2'})
|
||||||
});
|
});
|
||||||
|
|
||||||
var someDirectiveWithHostAttributes = DirectiveMetadata.create({
|
var someDirectiveWithHostAttributes = DirectiveMetadata.create({
|
||||||
selector: '[some-decor-with-host-attrs]',
|
selector: '[some-decor-with-host-attrs]',
|
||||||
host: MapWrapper.createFromStringMap({'attr_name': 'attr_val', 'class': 'foo bar'})
|
host: MapWrapper.createFromStringMap<string>({'attr_name': 'attr_val', 'class': 'foo bar'})
|
||||||
});
|
});
|
||||||
|
|
||||||
var someDirectiveWithEvents = DirectiveMetadata.create(
|
var someDirectiveWithEvents = DirectiveMetadata.create({
|
||||||
{selector: '[some-decor-events]', host: MapWrapper.createFromStringMap({'(click)': 'doIt()'})});
|
selector: '[some-decor-events]',
|
||||||
|
host: MapWrapper.createFromStringMap<string>({'(click)': 'doIt()'})
|
||||||
|
});
|
||||||
|
|
||||||
var someDirectiveWithGlobalEvents = DirectiveMetadata.create({
|
var someDirectiveWithGlobalEvents = DirectiveMetadata.create({
|
||||||
selector: '[some-decor-globalevents]',
|
selector: '[some-decor-globalevents]',
|
||||||
host: MapWrapper.createFromStringMap({'(window:resize)': 'doItGlobal()'})
|
host: MapWrapper.createFromStringMap<string>({'(window:resize)': 'doItGlobal()'})
|
||||||
});
|
});
|
||||||
|
|
||||||
var componentWithNonElementSelector = DirectiveMetadata.create({
|
var componentWithNonElementSelector = DirectiveMetadata.create({
|
||||||
|
@ -257,7 +257,7 @@ export function main() {
|
|||||||
compile()
|
compile()
|
||||||
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
|
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
|
||||||
.then((_) => {
|
.then((_) => {
|
||||||
ObservableWrapper.subscribe(eventBus, (ev) => {
|
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
|
||||||
if (ev.startsWith('parent activate')) {
|
if (ev.startsWith('parent activate')) {
|
||||||
completer.resolve(true);
|
completer.resolve(true);
|
||||||
}
|
}
|
||||||
@ -292,7 +292,7 @@ export function main() {
|
|||||||
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
|
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
|
||||||
.then((_) => rtr.navigate('/parent-deactivate/child-deactivate'))
|
.then((_) => rtr.navigate('/parent-deactivate/child-deactivate'))
|
||||||
.then((_) => {
|
.then((_) => {
|
||||||
ObservableWrapper.subscribe(eventBus, (ev) => {
|
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
|
||||||
if (ev.startsWith('deactivate')) {
|
if (ev.startsWith('deactivate')) {
|
||||||
completer.resolve(true);
|
completer.resolve(true);
|
||||||
rootTC.detectChanges();
|
rootTC.detectChanges();
|
||||||
@ -356,7 +356,7 @@ export function main() {
|
|||||||
compile()
|
compile()
|
||||||
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
|
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
|
||||||
.then((_) => {
|
.then((_) => {
|
||||||
ObservableWrapper.subscribe(eventBus, (ev) => {
|
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
|
||||||
if (ev.startsWith('canActivate')) {
|
if (ev.startsWith('canActivate')) {
|
||||||
completer.resolve(true);
|
completer.resolve(true);
|
||||||
}
|
}
|
||||||
@ -376,7 +376,7 @@ export function main() {
|
|||||||
compile()
|
compile()
|
||||||
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
|
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
|
||||||
.then((_) => {
|
.then((_) => {
|
||||||
ObservableWrapper.subscribe(eventBus, (ev) => {
|
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
|
||||||
if (ev.startsWith('canActivate')) {
|
if (ev.startsWith('canActivate')) {
|
||||||
completer.resolve(false);
|
completer.resolve(false);
|
||||||
}
|
}
|
||||||
@ -401,7 +401,7 @@ export function main() {
|
|||||||
expect(rootTC.nativeElement).toHaveText('canDeactivate {A}');
|
expect(rootTC.nativeElement).toHaveText('canDeactivate {A}');
|
||||||
expect(log).toEqual('');
|
expect(log).toEqual('');
|
||||||
|
|
||||||
ObservableWrapper.subscribe(eventBus, (ev) => {
|
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
|
||||||
if (ev.startsWith('canDeactivate')) {
|
if (ev.startsWith('canDeactivate')) {
|
||||||
completer.resolve(true);
|
completer.resolve(true);
|
||||||
}
|
}
|
||||||
@ -426,7 +426,7 @@ export function main() {
|
|||||||
expect(rootTC.nativeElement).toHaveText('canDeactivate {A}');
|
expect(rootTC.nativeElement).toHaveText('canDeactivate {A}');
|
||||||
expect(log).toEqual('');
|
expect(log).toEqual('');
|
||||||
|
|
||||||
ObservableWrapper.subscribe(eventBus, (ev) => {
|
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
|
||||||
if (ev.startsWith('canDeactivate')) {
|
if (ev.startsWith('canDeactivate')) {
|
||||||
completer.resolve(false);
|
completer.resolve(false);
|
||||||
}
|
}
|
||||||
@ -473,7 +473,7 @@ export function main() {
|
|||||||
expect(log).toEqual('canActivate: null -> /reuse-hooks/1;' +
|
expect(log).toEqual('canActivate: null -> /reuse-hooks/1;' +
|
||||||
'onActivate: null -> /reuse-hooks/1;');
|
'onActivate: null -> /reuse-hooks/1;');
|
||||||
|
|
||||||
ObservableWrapper.subscribe(eventBus, (ev) => {
|
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
|
||||||
if (ev.startsWith('canReuse')) {
|
if (ev.startsWith('canReuse')) {
|
||||||
completer.resolve(true);
|
completer.resolve(true);
|
||||||
}
|
}
|
||||||
@ -497,7 +497,7 @@ export function main() {
|
|||||||
expect(log).toEqual('canActivate: null -> /reuse-hooks/1;' +
|
expect(log).toEqual('canActivate: null -> /reuse-hooks/1;' +
|
||||||
'onActivate: null -> /reuse-hooks/1;');
|
'onActivate: null -> /reuse-hooks/1;');
|
||||||
|
|
||||||
ObservableWrapper.subscribe(eventBus, (ev) => {
|
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
|
||||||
if (ev.startsWith('canReuse')) {
|
if (ev.startsWith('canReuse')) {
|
||||||
completer.resolve(false);
|
completer.resolve(false);
|
||||||
}
|
}
|
||||||
|
@ -153,5 +153,5 @@ class MockMetric extends Metric {
|
|||||||
|
|
||||||
class MockSampler extends Sampler {
|
class MockSampler extends Sampler {
|
||||||
constructor() { super(); }
|
constructor() { super(); }
|
||||||
sample(): Promise<SampleState> { return PromiseWrapper.resolve(23); }
|
sample(): Promise<SampleState> { return PromiseWrapper.resolve(new SampleState([], [])); }
|
||||||
}
|
}
|
||||||
|
38
tools/tslint/requireParameterTypeRule.ts
Normal file
38
tools/tslint/requireParameterTypeRule.ts
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
/// <reference path="../../node_modules/typescript/bin/typescriptServices.d.ts" />
|
||||||
|
/// <reference path="../../node_modules/gulp-tslint/node_modules/tslint/lib/tslint.d.ts" />
|
||||||
|
|
||||||
|
export class Rule extends Lint.Rules.AbstractRule {
|
||||||
|
public static FAILURE_STRING = "missing type declaration";
|
||||||
|
|
||||||
|
public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
|
||||||
|
const typedefWalker = new TypedefWalker(sourceFile, this.getOptions());
|
||||||
|
return this.applyWithWalker(typedefWalker);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class TypedefWalker extends Lint.RuleWalker {
|
||||||
|
public visitMethodDeclaration(node: ts.MethodDeclaration) {
|
||||||
|
if (node.name.getText().charAt(0) !== '_') {
|
||||||
|
node.parameters.forEach((p: ts.ParameterDeclaration) => {
|
||||||
|
// a parameter's "type" could be a specific string value, for example `fn(option:
|
||||||
|
// "someOption", anotherOption: number)`
|
||||||
|
if (p.type == null || p.type.kind !== ts.SyntaxKind.StringLiteral) {
|
||||||
|
this.checkTypeAnnotation(p.getEnd(), <ts.TypeNode>p.type, p.name);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
super.visitMethodDeclaration(node);
|
||||||
|
}
|
||||||
|
|
||||||
|
private checkTypeAnnotation(location: number, typeAnnotation: ts.TypeNode, name?: ts.Node) {
|
||||||
|
if (typeAnnotation == null) {
|
||||||
|
let ns = "<name missing>";
|
||||||
|
if (name != null && name.kind === ts.SyntaxKind.Identifier) {
|
||||||
|
ns = (<ts.Identifier>name).text;
|
||||||
|
}
|
||||||
|
if (ns.charAt(0) === '_') return;
|
||||||
|
let failure = this.createFailure(location, 1, "expected parameter " + ns + " to have a type");
|
||||||
|
this.addFailure(failure);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -40,21 +40,20 @@ class TypedefWalker extends Lint.RuleWalker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private handleCallSignature(node: ts.SignatureDeclaration) {
|
private handleCallSignature(node: ts.SignatureDeclaration) {
|
||||||
const location = (node.parameters != null) ? node.parameters.end : null;
|
|
||||||
// set accessors can't have a return type.
|
// set accessors can't have a return type.
|
||||||
if (node.kind !== ts.SyntaxKind.SetAccessor) {
|
if (node.kind !== ts.SyntaxKind.SetAccessor) {
|
||||||
this.checkTypeAnnotation(location, node.type, node.name);
|
this.checkTypeAnnotation(node.type, node.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private checkTypeAnnotation(location: number, typeAnnotation: ts.TypeNode, name?: ts.Node) {
|
private checkTypeAnnotation(typeAnnotation: ts.TypeNode, name?: ts.Node) {
|
||||||
if (typeAnnotation == null) {
|
if (typeAnnotation == null) {
|
||||||
let ns = "<name missing>";
|
let ns = "<name missing>";
|
||||||
if (name != null && name.kind === ts.SyntaxKind.Identifier) {
|
if (name != null && name.kind === ts.SyntaxKind.Identifier) {
|
||||||
ns = (<ts.Identifier>name).text;
|
ns = (<ts.Identifier>name).text;
|
||||||
}
|
}
|
||||||
if (ns.charAt(0) === '_') return;
|
if (ns.charAt(0) === '_') return;
|
||||||
let failure = this.createFailure(location, 1, "expected " + ns + " to have a return type");
|
let failure = this.createFailure(null, 1, "expected " + ns + " to have a return type");
|
||||||
this.addFailure(failure);
|
this.addFailure(failure);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user