Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: on image load rate the 204 as error to display placeholder #606

Merged
merged 1 commit into from
Nov 14, 2024
Merged

fix: on image load rate the 204 as error to display placeholder #606

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions libs/angular-accelerator/src/lib/directives/src.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HttpClient } from '@angular/common/http'
import { HttpClient, HttpResponse } from '@angular/common/http'
import { Directive, ElementRef, EventEmitter, Input, Output } from '@angular/core'

@Directive({ selector: '[ocxSrc]' })
Expand All @@ -13,37 +13,50 @@ export class SrcDirective {
return this._src
}
set ocxSrc(value: string | undefined) {
if (value && this._src !== value) {
if (value && this._src !== value && window.location.hostname) {
try {
if (new URL(value, window.location.origin).hostname === window.location.hostname) {
this.httpClient.get(value, { responseType: 'blob' }).subscribe({
next: (blob) => {
const url = URL.createObjectURL(blob)
this.el.nativeElement.onload = () => {
URL.revokeObjectURL(url)
this.httpClient.get(value, { observe: 'response', responseType: 'blob' }).subscribe(
(response: HttpResponse<Blob>) => {
// ok with content
if (response?.status === 200) {
const url = URL.createObjectURL(response.body as Blob)
this.el.nativeElement.onload = () => {
URL.revokeObjectURL(url)
}
this.el.nativeElement.src = url
}
// no content
if (response?.status === 204) {
this.error.emit()
}
this.el.nativeElement.src = url
this.el.nativeElement.style.visibility = 'initial'
},
error: () => {
() => {
// on error
this.error.emit()
this.el.nativeElement.style.visibility = 'initial'
},
})
() => {
// on complete
this.el.nativeElement.style.visibility = 'initial'
}
)
} else {
this.el.nativeElement.src = value
this.el.nativeElement.style.visibility = 'initial'
}
} catch (error) {
console.log('Cannot parse URL ', value, error)
console.error('Cannot parse URL ', value, error)
this.el.nativeElement.src = value
this.el.nativeElement.style.visibility = 'initial'
}
this._src = value
}
}

constructor(private el: ElementRef, private httpClient: HttpClient) {
constructor(
private el: ElementRef,
private httpClient: HttpClient
) {
this.el.nativeElement.style.visibility = 'hidden'
}
}
Loading