Removed localhost url from websockets. Added check for browsers which…

… don't support Storage!
Saheb · Sep 18, 2015 · 6240115 · 6240115
1 parent ea8ec0b
commit 6240115
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/app/views/home.scala.html b/app/views/home.scala.html
@@ -19,6 +19,14 @@
         <link href="@routes.Assets.at("stylesheets/starter-template.css")" rel="stylesheet">
 
         <script>
+            if(typeof(Storage) !== "undefined") {
+                    // Code for localStorage/sessionStorage.
+                    console.log("Your browser has Storage! Game will work!");
+                } else {
+                    // Sorry! No Web Storage support..
+                    console.log("Your browser doesn't have Web Storage! Game will not work!");
+                    alert("Your browser doesn't have Web Storage! Game will not work!");
+            }
             var store = window.sessionStorage
             function checkLogin() {
                 if(store.length!=0)

diff --git a/public/loginCalls.js b/public/loginCalls.js
@@ -45,7 +45,6 @@ startApp()
 //attachSignin(document.getElementById('google-login-btn'));
 
 function attachSignin(element) {
-    console.log(element.id);
     auth2.attachClickHandler(element, {},
         function(googleUser) {
             document.getElementById('loginName').innerText =

diff --git a/public/sockets.js b/public/sockets.js
@@ -10,7 +10,15 @@ store.setItem("turn_number", "NA")
 //store.setItem("round_number", "0")
 
 var player_id = Number(store.getItem("loginId"))
-var ws = new WebSocket("ws://localhost:9000/gamePlay/"+ GAME_ID + "/" + player_id +  "/play")
+var loc = window.location, new_uri;
+if (loc.protocol === "https:") {
+    new_uri = "wss:";
+} else {
+    new_uri = "ws:";
+}
+new_uri += "//" + loc.host;
+//new_uri += loc.pathname;
+var ws = new WebSocket(new_uri + "/gamePlay/"+ GAME_ID + "/" + player_id +  "/play")
 ws.onopen = function()
 {
     // Web Socket is connected, send data using send()