skythedragon/papercats
1
0
Fork 0
forked from ilikecats/papercats
Code Pull Requests Activity

Use location.host

Browse Source
This commit is contained in:
Mimi 2019-11-30 16:58:13 +08:00
parent 277220ae14
commit fe940a3182
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client.js
View File

@ -4,9 +4,9 @@ var io = require("socket.io-client");
var client = require("./src/game-client"); var client = require("./src/game-client");
var config = require("./config.json"); var config = require("./config.json");
function run(port, flag) { function run(flag) {
client.renderer = flag ? require("./src/mode/god") : require("./src/mode/player"); client.renderer = flag ? require("./src/mode/god") : require("./src/mode/player");
client.connectGame("//" + window.location.hostname + ":" + port, $("#name").val(), function(success, msg) { client.connectGame("//" + location.host, $("#name").val(), function(success, msg) {
if (success) { if (success) {
$("#main-ui").fadeIn(1000); $("#main-ui").fadeIn(1000);
$("#begin, #wasted").fadeOut(1000); $("#begin, #wasted").fadeOut(1000);
@ -25,8 +25,7 @@ $(document).ready(function() {
} }
err.text("Loading... Please wait"); //TODO: show loading screen err.text("Loading... Please wait"); //TODO: show loading screen
(function() { (function() {
var port = location.port; var socket = io(`//${location.host}`, {
var socket = io(`//${location.hostname}${port ? ":" + port : ""}`, {
forceNew: true, forceNew: true,
upgrade: false, upgrade: false,
transports: ["websocket"] transports: ["websocket"]
@ -41,10 +40,10 @@ $(document).ready(function() {
if (evt.which === 13) run(); if (evt.which === 13) run();
}); });
$(".start").removeAttr("disabled").click(function(evt) { $(".start").removeAttr("disabled").click(function(evt) {
run(port); run();
}); });
$(".spectate").removeAttr("disabled").click(function(evt) { $(".spectate").removeAttr("disabled").click(function(evt) {
run(port, true); run(true);
}); });
}); });
socket.on("connect_error", function() { socket.on("connect_error", function() {