From 0449442783a357ca6aa73478c1d97cb11169ea19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Wed, 7 Feb 2018 15:56:44 +0100
Subject: [PATCH] Fixed fullscreen-open-issue

---
 server/public/assets/js/channel.js        | 1 -
 server/public/assets/js/hostcontroller.js | 2 +-
 server/public/assets/js/playercontrols.js | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js
index 91cb15de..8e89d369 100644
--- a/server/public/assets/js/channel.js
+++ b/server/public/assets/js/channel.js
@@ -111,7 +111,6 @@ var Channel = {
             get_list_listener();
             setup_suggested_listener();
             setup_viewers_listener();
-
         } else {
             $("#channel-load").css("display", "none");
             $("#player").css("opacity", "1");
diff --git a/server/public/assets/js/hostcontroller.js b/server/public/assets/js/hostcontroller.js
index 1b74c77e..b70d15b4 100755
--- a/server/public/assets/js/hostcontroller.js
+++ b/server/public/assets/js/hostcontroller.js
@@ -16,7 +16,7 @@ var Hostcontroller = {
                 window.parentWindow.postMessage({type: "controller", id: id}, window.parentOrigin);
             }
         }
-        var codeURL = "https://remote."+window.location.hostname+"/"+id;
+        var codeURL = window.location.protocol + "//remote."+window.location.hostname+"/"+id;
         $("#code-text").text(id);
         $("#code-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+codeURL);
         $("#code-link").attr("href", codeURL);
diff --git a/server/public/assets/js/playercontrols.js b/server/public/assets/js/playercontrols.js
index a19a3781..5115a20e 100755
--- a/server/public/assets/js/playercontrols.js
+++ b/server/public/assets/js/playercontrols.js
@@ -43,7 +43,7 @@ var Playercontrols = {
     },
 
     fullscreen: function() {
-        var playerElement = $("#player");
+        var playerElement = $("#player").get(0);
         var requestFullScreen = playerElement.requestFullScreen || playerElement.mozRequestFullScreen || playerElement.webkitRequestFullScreen;
         if (requestFullScreen) {
             requestFullScreen.bind(playerElement)();