fixed bad merge

pull/4871/head
tidusjar 2 years ago
parent cf0df66772
commit 382c19500f

@ -75,11 +75,3 @@ export class ImageComponent {
} }
} }
} }
// Retry the original image
const timeout = setTimeout(() => {
event.target.src = this.src;
clearTimeout(timeout);
}, Math.floor(Math.random() * (7000 - 1000 + 1)) + 1000);
}
}

@ -9,7 +9,6 @@ import { RouterModule } from "@angular/router";
import { SharedModule } from "../shared/shared.module"; import { SharedModule } from "../shared/shared.module";
import { SkeletonModule } from 'primeng/skeleton'; import { SkeletonModule } from 'primeng/skeleton';
import { ImageComponent } from 'app/components'; import { ImageComponent } from 'app/components';
import { ImageComponent } from 'app/components';
@NgModule({ @NgModule({
imports: [ imports: [

@ -1,6 +1,5 @@
import { Component, OnDestroy, OnInit, Inject } from "@angular/core"; import { Component, OnDestroy, OnInit, Inject } from "@angular/core";
import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms"; import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
import { ActivatedRoute, Router } from "@angular/router"; import { ActivatedRoute, Router } from "@angular/router";
import { TranslateService } from "@ngx-translate/core"; import { TranslateService } from "@ngx-translate/core";
@ -20,7 +19,6 @@ import { RadarrFacade } from "app/state/radarr";
styleUrls: ["./login.component.scss"], styleUrls: ["./login.component.scss"],
}) })
export class LoginComponent implements OnDestroy, OnInit { export class LoginComponent implements OnDestroy, OnInit {
public form: UntypedFormGroup;
public form: UntypedFormGroup; public form: UntypedFormGroup;
public customizationSettings: ICustomizationSettings; public customizationSettings: ICustomizationSettings;
public authenticationSettings: IAuthenticationSettings; public authenticationSettings: IAuthenticationSettings;
@ -55,7 +53,6 @@ export class LoginComponent implements OnDestroy, OnInit {
private router: Router, private router: Router,
private status: StatusService, private status: StatusService,
private fb: UntypedFormBuilder, private fb: UntypedFormBuilder,
private fb: UntypedFormBuilder,
private settingsService: SettingsService, private settingsService: SettingsService,
private customziationFacade: CustomizationFacade, private customziationFacade: CustomizationFacade,
private route: ActivatedRoute, private route: ActivatedRoute,
@ -122,7 +119,6 @@ export class LoginComponent implements OnDestroy, OnInit {
.subscribe((x) => (this.errorValidation = x)); .subscribe((x) => (this.errorValidation = x));
} }
public onSubmit(form: UntypedFormGroup) {
public onSubmit(form: UntypedFormGroup) { public onSubmit(form: UntypedFormGroup) {
if (form.invalid) { if (form.invalid) {
this.notify.open(this.errorValidation, "OK", { this.notify.open(this.errorValidation, "OK", {

@ -142,14 +142,7 @@ export class TvDetailsComponent implements OnInit {
this.tv.images.original = 'https://image.tmdb.org/t/p/w300/' + this.tv.images.original this.tv.images.original = 'https://image.tmdb.org/t/p/w300/' + this.tv.images.original
}; };
} }
private checkPoster() {
if (this.tv.images.original == null) {
this.tv.images.original = "../../../images/default_movie_poster.png";
}
else {
this.tv.images.original = 'https://image.tmdb.org/t/p/w300/' + this.tv.images.original
};
}
private loadAdvancedInfo() { private loadAdvancedInfo() {
const profile = this.sonarrService.getQualityProfilesWithoutSettings(); const profile = this.sonarrService.getQualityProfilesWithoutSettings();
const folders = this.sonarrService.getRootFoldersWithoutSettings(); const folders = this.sonarrService.getRootFoldersWithoutSettings();

Loading…
Cancel
Save