Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-04-27 12:13:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix error handler

Browse Source
This commit is contained in:
Roman Hotsiy 2016-10-31 09:16:39 +02:00
parent b8b3bf328e
commit a94afe5f2d
No known key found for this signature in database
GPG Key ID: 5CB7B3ACABA57CB0
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/components/Redoc/redoc.ts
View File

@ -67,7 +67,10 @@ export class Redoc extends BaseComponent implements OnInit {
} }
load() { load() {
this.specMgr.load(this.options.specUrl); this.specMgr.load(this.options.specUrl).catch(err => {
throw err;
});
this.specMgr.spec.subscribe((spec) => { this.specMgr.spec.subscribe((spec) => {
if (!spec) { if (!spec) {
this.specLoading = true; this.specLoading = true;
@ -82,12 +85,15 @@ export class Redoc extends BaseComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.appState.error.subscribe(_err => { this.appState.error.subscribe(_err => {
// do not show errors that occuered after spec has been already loaded if (!_err) return;
// TODO: change this in future to show in e.g. popup
//if (this.specLoaded) return;
setTimeout(() => { if (this.specLoading) {
this.specLoaded = true;
this.hideLoadingAnimation();
}
this.error = _err; this.error = _err;
this.changeDetector.markForCheck();
setTimeout(() => {
this.changeDetector.detectChanges() this.changeDetector.detectChanges()
}); });
}) })

2
lib/utils/custom-error-handler.ts
View File

@ -7,7 +7,7 @@ export class CustomErrorHandler extends ErrorHandler {
super(true); super(true);
} }
handleError(error) { handleError(error) {
this.appState.error.next(error); this.appState.error.next(error && error.rejection || error);
super.handleError(error); super.handleError(error);
} }
} }