Fix youtube player control

2 files changed, 10 insertions, 7 deletions

diff --git a/res/client.js b/res/client.js
index c197ff2..224cb9e 100644
--- a/res/client.js
+++ b/res/client.js
@@ -1891,10 +1891,11 @@ client_players_Youtube.prototype = {
 		this.video = window.document.createElement("div");
 		this.video.id = "videoplayer";
 		this.playerEl.appendChild(this.video);
-		this.youtube = new YT.Player(this.video.id,{ videoId : client_players_Youtube.extractVideoId(item.url), playerVars : { autoplay : 1, modestbranding : 1, rel : 0, showinfo : 0}, events : { onStateChange : function(e) {
-			switch(e.data) {
+		this.youtube = new YT.Player(this.video.id,{ videoId : client_players_Youtube.extractVideoId(item.url), playerVars : { autoplay : 1, modestbranding : 1, rel : 0, showinfo : 0, start : 0}, events : { onReady : function(e) {
+			return _gthis.isLoaded = true;
+		}, onStateChange : function(e1) {
+			switch(e1.data) {
 			case -1:
-				_gthis.isLoaded = true;
 				_gthis.player.onCanBePlayed();
 				break;
 			case 0:
@@ -1918,7 +1919,9 @@ client_players_Youtube.prototype = {
 		if(this.video == null) {
 			return;
 		}
-		this.playerEl.removeChild(this.video);
+		if(this.playerEl.contains(this.video)) {
+			this.playerEl.removeChild(this.video);
+		}
 		this.video = null;
 	}
 	,play: function() {
diff --git a/src/client/players/Youtube.hx b/src/client/players/Youtube.hx
index 39328e0..4307514 100644
--- a/src/client/players/Youtube.hx
+++ b/src/client/players/Youtube.hx
@@ -137,13 +137,13 @@ class Youtube implements IPlayer {
 				modestbranding: 1,
 				rel: 0,
 				showinfo: 0,
+				start: 0
 			},
 			events: {
-				// onReady: e -> player.onCanBePlayed(),
+				onReady: e -> isLoaded = true,
 				onStateChange: e -> {
 					switch (e.data) {
 						case UNSTARTED:
-							isLoaded = true;
 							player.onCanBePlayed();
 						case ENDED:
 						case PLAYING:
@@ -161,7 +161,7 @@ class Youtube implements IPlayer {
 
 	public function removeVideo():Void {
 		if (video == null) return;
-		playerEl.removeChild(video);
+		if (playerEl.contains(video)) playerEl.removeChild(video);
 		video = null;
 	}