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

chore(build): fix flakiness of the element probe global test

This commit is contained in:
mlaval 2015-11-26 19:38:14 +01:00 committed by Jeremy Elbourn
parent 62c2ed7c43
commit fb16c39496
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/facade/lang.ts
View File

@ -354,7 +354,7 @@ export function setValueOnPath(global: any, path: string, value: any) {
var obj: any = global;
while (parts.length > 1) {
var name = parts.shift();
if (obj.hasOwnProperty(name)) {
if (obj.hasOwnProperty(name) && isPresent(obj[name])) {
obj = obj[name];
} else {
obj = obj[name] = {};

2
modules/angular2/src/platform/browser/tools/tools.ts
View File

@ -23,5 +23,5 @@ export function enableDebugTools(ref: ComponentRef): void {
* Disables Angular 2 tools.
*/
export function disableDebugTools(): void {
context.ng = undefined;
delete context.ng;
}

2
modules/angular2/src/platform/dom/debug/debug_element_view_listener.ts
View File

@ -72,4 +72,4 @@ export const ELEMENT_PROBE_PROVIDERS: any[] = CONST_EXPR([
CONST_EXPR(new Provider(AppViewListener, {useExisting: DebugElementViewListener})),
]);
export const ELEMENT_PROBE_BINDINGS = ELEMENT_PROBE_PROVIDERS;
export const ELEMENT_PROBE_BINDINGS = ELEMENT_PROBE_PROVIDERS;

2
modules/angular2/test/platform/browser/debug/debug_element_view_listener_spec.ts
View File

@ -68,7 +68,7 @@ export function main() {
async.done();
});
}), 10000);
}), 1000);
}
});
}