cargdev/angular
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(upgrade): propagate return value of resumeBootstrap (#22754)

Browse Source 
Fixes #22723

PR Close #22754
This commit is contained in:
Jason Bedard
2018-03-14 00:17:09 -07:00
committed by Alex Rickabaugh
parent ff34d5ea7a
commit a2330ff2db
4 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/upgrade/src/dynamic/upgrade_adapter.ts
View File

@ -389,8 +389,9 @@ export class UpgradeAdapter {
const originalResumeBootstrap: () => void = windowAngular.resumeBootstrap;
windowAngular.resumeBootstrap = function() {
windowAngular.resumeBootstrap = originalResumeBootstrap;
windowAngular.resumeBootstrap.apply(this, arguments);
const r = windowAngular.resumeBootstrap.apply(this, arguments);
resolve();
return r;
};
} else {
resolve();

2
packages/upgrade/src/static/upgrade_module.ts
View File

@ -268,7 +268,7 @@ export class UpgradeModule {
windowAngular.resumeBootstrap = function() {
let args = arguments;
windowAngular.resumeBootstrap = originalResumeBootstrap;
ngZone.run(() => { windowAngular.resumeBootstrap.apply(this, args); });
return ngZone.run(() => windowAngular.resumeBootstrap.apply(this, args));
};
}
}