CIT/Vmeda.Online
3
0
Fork 1
forked from EVOgeek/Vmeda.Online
Code Pull Requests Activity

MOBILE-3068 core: Fix img loaded event if no URL

Browse Source
This commit is contained in:
Dani Palou 2019-08-27 09:27:13 +02:00
parent 06f4b0ed48
commit ebd4577be2
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/directives/external-content.ts
View File

@ -152,12 +152,22 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
// Avoid handling data url's.
if (url && url.indexOf('data:') === 0) {
this.invalid = true;
this.onLoad.emit();
this.loaded = true;
return;
}
this.handleExternalContent(targetAttr, url, siteId).catch(() => {
// Ignore errors.
// Error handling content. Make sure the loaded event is triggered for images.
if (tagName === 'IMG') {
if (url) {
this.waitForLoad();
} else {
this.onLoad.emit();
this.loaded = true;
}
}
});
}
@ -204,10 +214,6 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
this.addSource(url);
}
if (tagName === 'IMG') {
this.waitForLoad();
}
return Promise.reject(null);
}

5
src/directives/format-text.ts
View File

@ -468,7 +468,8 @@ export class CoreFormatTextDirective implements OnChanges {
// Wait for images to load.
let promise: Promise<any> = null;
if (externalImages.length) {
promise = Promise.all(externalImages.map((externalImage): any => {
// Automatically reject the promise after 5 seconds to prevent blocking the user forever.
promise = this.utils.timeoutPromise(this.utils.allPromises(externalImages.map((externalImage): any => {
if (externalImage.loaded) {
// Image has already been loaded, no need to wait.
return Promise.resolve();
@ -480,7 +481,7 @@ export class CoreFormatTextDirective implements OnChanges {
resolve();
});
});
}));
})), 5000);
} else {
promise = Promise.resolve();
}