From 29a805ab8732740c465ffb486fe5a59e6bd8c55f Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Tue, 13 Sep 2016 02:00:50 -0600 Subject: [PATCH] Update chat stuff to point to new+improved server code --- www/js/main.js | 3 +-- www/js/user.js | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/www/js/main.js b/www/js/main.js index edeaa55..69aa620 100644 --- a/www/js/main.js +++ b/www/js/main.js @@ -53,9 +53,8 @@ function serverProblemsDialog(errmsg) { } function mkApiUrl(action, server) { - server = typeof server !== 'undefined' ? server : "gs"; + server = "gs"; return "http://" + server + ".terranquest.net/" + action + ".php"; - //return "config/" + action + ".json"; } /** diff --git a/www/js/user.js b/www/js/user.js index cee0c98..55f0d89 100644 --- a/www/js/user.js +++ b/www/js/user.js @@ -51,7 +51,7 @@ function refreshStats() { function getChat() { if (lockGot) { - $.getJSON(mkApiUrl('chat', 'cs'), { + $.getJSON(mkApiUrl('chat'), { lat: latitude, long: longitude }, function (data) { @@ -59,10 +59,10 @@ function getChat() { var content = ""; data.forEach(function (msg) { var usernameclass = "chat-username"; - if (msg.username === 'skylarmt') { + if (msg.nickname === 'skylarmt') { usernameclass = "chat-username-admin"; } - content += "" + msg.username + " " + msg.message + "
"; + content += "" + msg.nickname + " " + msg.message + "
"; }); $('#chatmsgs').html(content); }); @@ -81,8 +81,7 @@ setInterval(function () { $("#chatsendform").submit(function (event) { var message = $('#chatbox-input').val(); if (message !== '') { - $.post(mkApiUrl('chat', 'cs'), { - user: username, + $.post(mkApiUrl('chat'), { lat: latitude, long: longitude, msg: message