deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-08 00:32:19 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27 from gdamjan/proxy-path-support

Browse source 
Allow The Lounge to be proxied behind a /path/ url
This commit is contained in:
Alistair McKinlay 2016-02-18 08:18:37 +00:00
parent fc4f98fd3c cf1f24bff6
commit a95d5e22ee
2 changed files with 7 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 id="theme" rel="stylesheet" href="<%= theme %>">
<link rel="shortcut icon" href="/img/favicon.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="shortcut icon" href="img/favicon.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">
</head>
<body class="<%= public ? "public" : "" %>">

7
client/js/lounge.js
View file

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