supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21 from thelounge/revert-20-gdamjan-path

Browse Source 
Revert "Allow The Lounge to be proxied behind a /path/ url"
This commit is contained in:
Jérémie Astori 2016-02-13 02:23:17 -05:00
commit b1e9a958d2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/index.html
View File

@ -16,9 +16,9 @@
<link rel="stylesheet" href="css/style.css"> <link rel="stylesheet" href="css/style.css">
<link id="theme" rel="stylesheet" href="<%= theme %>"> <link id="theme" rel="stylesheet" href="<%= theme %>">
<link rel="shortcut icon" href="img/favicon.png"> <link rel="shortcut icon" href="/img/favicon.png">
<link rel="icon" sizes="192x192" href="img/touch-icon-192x192.png"> <link rel="icon" sizes="192x192" href="/img/touch-icon-192x192.png">
<link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png"> <link rel="apple-touch-icon" sizes="120x120" href="/img/apple-touch-icon-120x120.png">
</head> </head>
<body class="<%= public ? "public" : "" %>"> <body class="<%= public ? "public" : "" %>">

6
client/js/lounge.js
View File

@ -1,5 +1,5 @@
$(function() { $(function() {
var socket = io({path:"./socket.io/"}); var socket = io();
var commands = [ var commands = [
"/close", "/close",
"/connect", "/connect",
@ -38,7 +38,7 @@ $(function() {
var pop; var pop;
try { try {
pop = new Audio(); pop = new Audio();
pop.src = "audio/pop.ogg"; pop.src = "/audio/pop.ogg";
} catch (e) { } catch (e) {
pop = { pop = {
play: $.noop play: $.noop
@ -656,7 +656,7 @@ $(function() {
if (settings.badge && Notification.permission === "granted") { if (settings.badge && Notification.permission === "granted") {
var notify = new Notification(msg.from + " says:", { var notify = new Notification(msg.from + " says:", {
body: msg.text.trim(), body: msg.text.trim(),
icon: "img/logo-64.png", icon: "/img/logo-64.png",
tag: target tag: target
}); });
notify.onclick = function() { notify.onclick = function() {