diff --git a/commands.js b/commands.js index 048f185..0a5e2c9 100644 --- a/commands.js +++ b/commands.js @@ -1,4 +1,4 @@ -import { SERVER_BUFFER } from "/state.js"; +import { SERVER_BUFFER } from "./state.js"; function getActiveClient(app) { var buf = app.state.buffers.get(app.state.activeBuffer); diff --git a/components/app.js b/components/app.js index c62a08d..395398e 100644 --- a/components/app.js +++ b/components/app.js @@ -1,17 +1,17 @@ -import * as irc from "/lib/irc.js"; -import Client from "/lib/client.js"; -import Buffer from "/components/buffer.js"; -import BufferList from "/components/buffer-list.js"; -import BufferHeader from "/components/buffer-header.js"; -import MemberList from "/components/member-list.js"; -import Connect from "/components/connect.js"; -import Composer from "/components/composer.js"; -import ScrollManager from "/components/scroll-manager.js"; -import { html, Component, createRef } from "/lib/index.js"; -import { strip as stripANSI } from "/lib/ansi.js"; -import { SERVER_BUFFER, BufferType, ReceiptType, NetworkStatus, Unread } from "/state.js"; -import commands from "/commands.js"; -import { setup as setupKeybindings } from "/keybindings.js"; +import * as irc from "../lib/irc.js"; +import Client from "../lib/client.js"; +import Buffer from "./buffer.js"; +import BufferList from "./buffer-list.js"; +import BufferHeader from "./buffer-header.js"; +import MemberList from "./member-list.js"; +import Connect from "./connect.js"; +import Composer from "./composer.js"; +import ScrollManager from "./scroll-manager.js"; +import { html, Component, createRef } from "../lib/index.js"; +import { strip as stripANSI } from "../lib/ansi.js"; +import { SERVER_BUFFER, BufferType, ReceiptType, NetworkStatus, Unread } from "../state.js"; +import commands from "../commands.js"; +import { setup as setupKeybindings } from "../keybindings.js"; const CHATHISTORY_MAX_SIZE = 4000; @@ -189,6 +189,10 @@ export default class App extends Component { if (window.location.protocol != "https:") { proto = "ws:"; } + var path = window.location.pathname || "/"; + if (!window.location.host) { + path = "/"; + } var serverURL; if (params.server) { @@ -198,7 +202,7 @@ export default class App extends Component { serverURL = params.server; } } else { - serverURL = proto + "//" + host + "/socket"; + serverURL = proto + "//" + host + path + "socket"; } this.state.connectParams.serverURL = serverURL; diff --git a/components/buffer-header.js b/components/buffer-header.js index eaab22f..66d717a 100644 --- a/components/buffer-header.js +++ b/components/buffer-header.js @@ -1,7 +1,7 @@ -import { html, Component } from "/lib/index.js"; -import linkify from "/lib/linkify.js"; -import { strip as stripANSI } from "/lib/ansi.js"; -import { BufferType, NetworkStatus } from "/state.js"; +import { html, Component } from "../lib/index.js"; +import linkify from "../lib/linkify.js"; +import { strip as stripANSI } from "../lib/ansi.js"; +import { BufferType, NetworkStatus } from "../state.js"; const UserStatus = { HERE: "here", diff --git a/components/buffer-list.js b/components/buffer-list.js index 2491b98..f8e09f7 100644 --- a/components/buffer-list.js +++ b/components/buffer-list.js @@ -1,6 +1,6 @@ -import * as irc from "/lib/irc.js"; -import { html, Component } from "/lib/index.js"; -import { BufferType, Unread, getBufferURL } from "/state.js"; +import * as irc from "../lib/irc.js"; +import { html, Component } from "../lib/index.js"; +import { BufferType, Unread, getBufferURL } from "../state.js"; function getNetworkName(network) { var bouncerStr = network.isupport.get("BOUNCER"); diff --git a/components/buffer.js b/components/buffer.js index b285b9e..7ef95cf 100644 --- a/components/buffer.js +++ b/components/buffer.js @@ -1,8 +1,8 @@ -import { html, Component } from "/lib/index.js"; -import linkify from "/lib/linkify.js"; -import * as irc from "/lib/irc.js"; -import { strip as stripANSI } from "/lib/ansi.js"; -import { BufferType, getNickURL, getMessageURL } from "/state.js"; +import { html, Component } from "../lib/index.js"; +import linkify from "../lib/linkify.js"; +import * as irc from "../lib/irc.js"; +import { strip as stripANSI } from "../lib/ansi.js"; +import { BufferType, getNickURL, getMessageURL } from "../state.js"; function djb2(s) { var hash = 5381; diff --git a/components/composer.js b/components/composer.js index 985b2f0..14f7506 100644 --- a/components/composer.js +++ b/components/composer.js @@ -1,4 +1,4 @@ -import { html, Component, createRef } from "/lib/index.js"; +import { html, Component, createRef } from "../lib/index.js"; export default class Composer extends Component { state = { diff --git a/components/connect.js b/components/connect.js index bf22889..3dc5635 100644 --- a/components/connect.js +++ b/components/connect.js @@ -1,4 +1,4 @@ -import { html, Component } from "/lib/index.js"; +import { html, Component } from "../lib/index.js"; export default class Connect extends Component { state = { diff --git a/components/member-list.js b/components/member-list.js index 48bdcdf..545c055 100644 --- a/components/member-list.js +++ b/components/member-list.js @@ -1,5 +1,5 @@ -import { html, Component } from "/lib/index.js"; -import { getNickURL } from "/state.js"; +import { html, Component } from "../lib/index.js"; +import { getNickURL } from "../state.js"; class MemberItem extends Component { constructor(props) { diff --git a/components/scroll-manager.js b/components/scroll-manager.js index fa0d175..c204ed7 100644 --- a/components/scroll-manager.js +++ b/components/scroll-manager.js @@ -1,4 +1,4 @@ -import { html, Component } from "/lib/index.js"; +import { html, Component } from "../lib/index.js"; var store = new Map(); diff --git a/index.html b/index.html index 4b6d20a..5789027 100644 --- a/index.html +++ b/index.html @@ -3,15 +3,15 @@