From 000b5a7799418066f6ae613a3e429a0e848120f9 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sun, 27 Oct 2019 19:22:17 +0100
Subject: [PATCH] Resolving a bug with the player in the mobile version.

---
 Kyoo/ClientApp/src/app/player/player.component.ts     |  7 ++-----
 Kyoo/ClientApp/src/app/search/search.component.ts     | 11 +++++++++--
 .../src/app/services/library-resolver.service.ts      |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Kyoo/ClientApp/src/app/player/player.component.ts b/Kyoo/ClientApp/src/app/player/player.component.ts
index e447aa56..31fe27c1 100644
--- a/Kyoo/ClientApp/src/app/player/player.component.ts
+++ b/Kyoo/ClientApp/src/app/player/player.component.ts
@@ -63,7 +63,7 @@ export class PlayerComponent implements OnInit
 
 			this.title.setTitle(this.item.showTitle + " S" + this.item.seasonNumber + ":E" + this.item.episodeNumber + " - Kyoo");
 
-			if (navigator.userAgent.match(/Mobi/))
+			if (navigator.userAgent.match(/Mobi/) && document.fullscreenElement == null)
 			{
 				this.fullscreen();
 				screen.orientation.lock("landscape");
@@ -81,9 +81,6 @@ export class PlayerComponent implements OnInit
 		this.progress = document.getElementById("progress") as HTMLElement;
 		this.buffered = document.getElementById("buffered") as HTMLElement;
 		this.player.controls = false;
-		//console.log(this.player.volume * 100);
-		//this.volume = this.player.volume * 100;
-		//this.changeVolumeBtn();
 
 		this.player.onplay = () =>
 		{
@@ -206,7 +203,7 @@ export class PlayerComponent implements OnInit
 		{
 			if (navigator.userAgent.match(/Mobi/))
 			{
-				if (document.fullscreenElement == null)
+				if (document.fullscreenElement == null && this.router.url.startsWith("/watch"))
 					this.back();
 			}
 			else
diff --git a/Kyoo/ClientApp/src/app/search/search.component.ts b/Kyoo/ClientApp/src/app/search/search.component.ts
index b4b6e618..ce129c7e 100644
--- a/Kyoo/ClientApp/src/app/search/search.component.ts
+++ b/Kyoo/ClientApp/src/app/search/search.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from "@angular/router";
 import { SearchResut } from "../../models/search-result";
 import { Title } from "@angular/platform-browser";
@@ -8,7 +8,7 @@ import { Title } from "@angular/platform-browser";
   templateUrl: './search.component.html',
   styleUrls: ['./search.component.scss']
 })
-export class SearchComponent implements OnInit
+export class SearchComponent implements OnInit, OnDestroy
 {
 	items: SearchResut;
 
@@ -29,4 +29,11 @@ export class SearchComponent implements OnInit
 		searchBar.classList.add("searching");
 		searchBar.value = this.items.query;
 	}
+
+	ngOnDestroy()
+	{
+		let searchBar: HTMLInputElement = <HTMLInputElement>document.getElementById("search");
+		searchBar.classList.remove("searching");
+		searchBar.value = "";
+	}
 }
diff --git a/Kyoo/ClientApp/src/app/services/library-resolver.service.ts b/Kyoo/ClientApp/src/app/services/library-resolver.service.ts
index bfba2b67..b5efd549 100644
--- a/Kyoo/ClientApp/src/app/services/library-resolver.service.ts
+++ b/Kyoo/ClientApp/src/app/services/library-resolver.service.ts
@@ -10,7 +10,7 @@ import { Show } from "../../models/show";
 @Injectable()
 export class LibraryResolverService implements Resolve<Show[]>
 {
-  constructor(private http: HttpClient, private snackBar: MatSnackBar) { console.log("Library Resolver Created"); }
+  constructor(private http: HttpClient, private snackBar: MatSnackBar) { }
 
   resolve(route: ActivatedRouteSnapshot): Show[] | Observable<Show[]> | Promise<Show[]>
   {