← [ PiKVM Index ]
+
← [ PiKVM Index ]
This PiKVM device has running kvmd-ipmi daemon and provides IPMI 2.0 interface for some basic BMC operations like on/off/reset the server. diff --git a/web/ipmi/index.pug b/web/ipmi/index.pug index 6fb6bb68..381ae63e 100644 --- a/web/ipmi/index.pug +++ b/web/ipmi/index.pug @@ -3,7 +3,7 @@ extends ../start.pug append vars - - prefix = "../" + root_prefix = "../" title = "PiKVM IPMI Info" main_js = "ipmi/main" index_link = true diff --git a/web/kvm/index.html b/web/kvm/index.html index 41529564..6458193f 100644 --- a/web/kvm/index.html +++ b/web/kvm/index.html @@ -52,13 +52,15 @@ -
-
-
- ←
+ - ←
@@ -2283,7 +2285,9 @@
-// You can get this JSON using handle /api/info?fields=meta
++ // You can get this JSON using handle + /api/info?fields=meta
// In the standard configuration this data
// is specified in the file /etc/kvmd/meta.yaml
No data
diff --git a/web/kvm/index.pug b/web/kvm/index.pug index 5b0bf260..d202ada4 100644 --- a/web/kvm/index.pug +++ b/web/kvm/index.pug @@ -3,7 +3,7 @@ extends ../base.pug append vars - - prefix = "../" + root_prefix = "../" title = "PiKVM Session" main_js = "kvm/main" body_class = "body-no-select" diff --git a/web/kvm/navbar-health.pug b/web/kvm/navbar-health.pug index f33e3482..91696915 100644 --- a/web/kvm/navbar-health.pug +++ b/web/kvm/navbar-health.pug @@ -31,4 +31,4 @@ #fan-health-message-fail hr +menu_message("led-fan", "Fan failed", "led-gray") - | A fan error occured, please #[a(href="/api/log?seek=3600&follow=1" target="_blank") check the log] + | A fan error occured, please #[a(href=`${root_prefix}api/log?seek=3600&follow=1` target="_blank") check the log] diff --git a/web/kvm/navbar.pug b/web/kvm/navbar.pug index 4ea9812a..9ef1464e 100644 --- a/web/kvm/navbar.pug +++ b/web/kvm/navbar.pug @@ -83,7 +83,7 @@ mixin menu_spoiler(title) ul#navbar li.left - a(id="logo" href="/") ← + a(id="logo" href=root_prefix) ← img.svg-gray(src=`${svg_dir}/logo.svg` alt="π-kvm") include navbar-health.pug diff --git a/web/kvm/window-about.pug b/web/kvm/window-about.pug index 0c717aa3..8a1dc361 100644 --- a/web/kvm/window-about.pug +++ b/web/kvm/window-about.pug @@ -34,7 +34,8 @@ mixin about_tab(name, title, checked=false) +about_tab("meta", "Meta", true) div span.code-comment - | // You can get this JSON using handle #[a(target="_blank" href="/api/info?fields=meta") /api/info?fields=meta]#[br] + | // You can get this JSON using handle + | #[a(target="_blank" href=`${root_prefix}api/info?fields=meta`) /api/info?fields=meta]#[br] | // In the standard configuration this data#[br] | // is specified in the file /etc/kvmd/meta.yaml br diff --git a/web/login/index.html b/web/login/index.html index 389b5871..a8cbedd9 100644 --- a/web/login/index.html +++ b/web/login/index.html @@ -39,7 +39,9 @@ - diff --git a/web/login/index.pug b/web/login/index.pug index 084e017c..11600c01 100644 --- a/web/login/index.pug +++ b/web/login/index.pug @@ -3,7 +3,7 @@ extends ../base.pug append vars - - prefix = "../" + root_prefix = "../" title = "PiKVM Login" main_js = "login/main" css_list.push("window", "modal", "login/login") diff --git a/web/share/js/bb.js b/web/share/js/bb.js index ba49efa6..38549da6 100644 --- a/web/share/js/bb.js +++ b/web/share/js/bb.js @@ -23,6 +23,9 @@ "use strict"; +import {ROOT_PREFIX} from "./vars.js"; + + export var browser = new function() { // https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser/9851769 // https://github.com/fingerprintjs/fingerprintjs/discussions/641 @@ -133,12 +136,12 @@ export function checkBrowser(desktop_css, mobile_css) { let force_desktop = (new URL(window.location.href)).searchParams.get("force_desktop"); let force_mobile = (new URL(window.location.href)).searchParams.get("force_mobile"); if ((force_desktop || !browser.is_mobile) && !force_mobile) { - __addCssLink("/share/css/x-desktop.css"); + __addCssLink("x-desktop.css"); if (desktop_css) { __addCssLink(desktop_css); } } else { - __addCssLink("/share/css/x-mobile.css"); + __addCssLink("x-mobile.css"); if (mobile_css) { __addCssLink(mobile_css); } @@ -148,6 +151,7 @@ export function checkBrowser(desktop_css, mobile_css) { } function __addCssLink(path) { + path = `${ROOT_PREFIX}share/css/${path}`; console.log("===== Adding CSS:", path); let el_head = document.getElementsByTagName("head")[0]; let el_link = document.createElement("link"); diff --git a/web/share/js/index/main.js b/web/share/js/index/main.js index 19cba440..9ebb1f60 100644 --- a/web/share/js/index/main.js +++ b/web/share/js/index/main.js @@ -23,6 +23,7 @@ "use strict"; +import {ROOT_PREFIX} from "../vars.js"; import {tools, $} from "../tools.js"; import {checkBrowser} from "../bb.js"; import {wm, initWindowManager} from "../wm.js"; @@ -51,7 +52,7 @@ function __setAppText() { } function __loadKvmdInfo() { - tools.httpGet("/api/info", {"fields": "auth,meta,extras"}, function(http) { + tools.httpGet("api/info", {"fields": "auth,meta,extras"}, function(http) { if (http.status === 200) { let info = JSON.parse(http.responseText).result; @@ -100,7 +101,7 @@ function __loadKvmdInfo() { document.title = "PiKVM Index"; } } else if (http.status === 401 || http.status === 403) { - document.location.href = "/login"; + tools.currentOpen("login"); } else { setTimeout(__loadKvmdInfo, 1000); } @@ -108,11 +109,14 @@ function __loadKvmdInfo() { } function __makeApp(id, path, icon, name) { + // Tailing slash in href is added to avoid Nginx 301 redirect + // when the location doesn't have tailing slash: "foo -> foo/". + // Reverse proxy over PiKVM can be misconfigured to handle this. return `- +-@@ -121,9 +125,9 @@ function __makeApp(id, path, icon, name) { } function __logout() { - tools.httpPost("/api/auth/logout", null, function(http) { + tools.httpPost("api/auth/logout", null, function(http) { if (http.status === 200 || http.status === 401 || http.status === 403) { - document.location.href = "/login"; + tools.currentOpen("login"); } else { wm.error("Logout error", http.responseText); } diff --git a/web/share/js/ipmi/main.js b/web/share/js/ipmi/main.js index 26bd1f38..3f08e315 100644 --- a/web/share/js/ipmi/main.js +++ b/web/share/js/ipmi/main.js @@ -31,7 +31,7 @@ export function main() { } function __loadKvmdInfo() { - tools.httpGet("/api/info", null, function(http) { + tools.httpGet("api/info", null, function(http) { if (http.status === 200) { let ipmi_port = JSON.parse(http.responseText).result.extras.ipmi.port; let make_item = (comment, ipmi, api) => ` @@ -52,7 +52,7 @@ function __loadKvmdInfo() { ${make_item("Check the power status", "power status", "")} `; } else if (http.status === 401 || http.status === 403) { - document.location.href = "/login"; + tools.currentOpen("login"); } else { setTimeout(__loadKvmdInfo, 1000); } diff --git a/web/share/js/kvm/atx.js b/web/share/js/kvm/atx.js index ce3e4d27..6bdcf571 100644 --- a/web/share/js/kvm/atx.js +++ b/web/share/js/kvm/atx.js @@ -94,7 +94,7 @@ export function Atx(__recorder) { var __clickAtx = function(button) { let click_button = function() { - tools.httpPost("/api/atx/click", {"button": button}, function(http) { + tools.httpPost("api/atx/click", {"button": button}, function(http) { if (http.status === 409) { wm.error("Performing another ATX operation for other client.+
${tools.escape(name)}
Please try again later."); } else if (http.status !== 200) { diff --git a/web/share/js/kvm/gpio.js b/web/share/js/kvm/gpio.js index 41d5ee92..d4221b3d 100644 --- a/web/share/js/kvm/gpio.js +++ b/web/share/js/kvm/gpio.js @@ -23,6 +23,7 @@ "use strict"; +import {ROOT_PREFIX} from "../vars.js"; import {tools, $, $$} from "../tools.js"; import {wm} from "../wm.js"; @@ -138,7 +139,7 @@ export function Gpio(__recorder) { return `
`;
@@ -202,7 +203,7 @@ export function Gpio(__recorder) {
confirm = el.getAttribute("data-confirm-off");
}
let act = () => {
- __sendPost("/api/gpio/switch", {"channel": ch, "state": to});
+ __sendPost("api/gpio/switch", {"channel": ch, "state": to});
__recorder.recordGpioSwitchEvent(ch, to);
};
if (confirm) {
@@ -220,7 +221,7 @@ export function Gpio(__recorder) {
let ch = el.getAttribute("data-channel");
let confirm = el.getAttribute("data-confirm");
let act = () => {
- __sendPost("/api/gpio/pulse", {"channel": ch});
+ __sendPost("api/gpio/pulse", {"channel": ch});
__recorder.recordGpioPulseEvent(ch);
};
if (confirm) {
diff --git a/web/share/js/kvm/hid.js b/web/share/js/kvm/hid.js
index 65bd480d..e3466896 100644
--- a/web/share/js/kvm/hid.js
+++ b/web/share/js/kvm/hid.js
@@ -275,7 +275,7 @@ export function Hid(__getGeometry, __recorder) {
var __clickOutputsRadio = function(hid) {
let output = tools.radio.getValue(`hid-outputs-${hid}-radio`);
- tools.httpPost("/api/hid/set_params", {[`${hid}_output`]: output}, function(http) {
+ tools.httpPost("api/hid/set_params", {[`${hid}_output`]: output}, function(http) {
if (http.status !== 200) {
wm.error("Can't configure HID", http.responseText);
}
@@ -284,7 +284,7 @@ export function Hid(__getGeometry, __recorder) {
var __clickJigglerSwitch = function() {
let enabled = $("hid-jiggler-switch").checked;
- tools.httpPost("/api/hid/set_params", {"jiggler": enabled}, function(http) {
+ tools.httpPost("api/hid/set_params", {"jiggler": enabled}, function(http) {
if (http.status !== 200) {
wm.error(`Can't ${enabled ? "enabled" : "disable"} mouse jiggler`, http.responseText);
}
@@ -293,7 +293,7 @@ export function Hid(__getGeometry, __recorder) {
var __clickConnectSwitch = function() {
let connected = $("hid-connect-switch").checked;
- tools.httpPost("/api/hid/set_connected", {"connected": connected}, function(http) {
+ tools.httpPost("api/hid/set_connected", {"connected": connected}, function(http) {
if (http.status !== 200) {
wm.error(`Can't ${connected ? "connect" : "disconnect"} HID`, http.responseText);
}
@@ -303,7 +303,7 @@ export function Hid(__getGeometry, __recorder) {
var __clickResetButton = function() {
wm.confirm("Are you sure you want to reset HID (keyboard & mouse)?").then(function(ok) {
if (ok) {
- tools.httpPost("/api/hid/reset", null, function(http) {
+ tools.httpPost("api/hid/reset", null, function(http) {
if (http.status !== 200) {
wm.error("HID reset error", http.responseText);
}
diff --git a/web/share/js/kvm/main.js b/web/share/js/kvm/main.js
index c71e7fd6..b62d4286 100644
--- a/web/share/js/kvm/main.js
+++ b/web/share/js/kvm/main.js
@@ -31,7 +31,7 @@ import {Session} from "./session.js";
export function main() {
- if (checkBrowser(null, "/share/css/kvm/x-mobile.css")) {
+ if (checkBrowser(null, "kvm/x-mobile.css")) {
tools.storage.bindSimpleSwitch($("page-close-ask-switch"), "page.close.ask", true, function(value) {
if (value) {
window.onbeforeunload = function(event) {
@@ -48,7 +48,7 @@ export function main() {
initWindowManager();
- tools.el.setOnClick($("open-log-button"), () => window.open("/api/log?seek=3600&follow=1", "_blank"));
+ tools.el.setOnClick($("open-log-button"), () => tools.windowOpen("api/log?seek=3600&follow=1"));
tools.storage.bindSimpleSwitch(
$("page-full-tab-stream-switch"),
diff --git a/web/share/js/kvm/msd.js b/web/share/js/kvm/msd.js
index f0192745..13d53079 100644
--- a/web/share/js/kvm/msd.js
+++ b/web/share/js/kvm/msd.js
@@ -23,6 +23,7 @@
"use strict";
+import {ROOT_PREFIX} from "../vars.js";
import {tools, $} from "../tools.js";
import {wm} from "../wm.js";
@@ -270,14 +271,14 @@ export function Msd() {
var __clickDownloadButton = function() {
let image = encodeURIComponent($("msd-image-selector").value);
- window.open(`/api/msd/read?image=${image}`);
+ tools.windowOpen(`api/msd/read?image=${image}`);
};
var __clickRemoveButton = function() {
let name = $("msd-image-selector").value;
wm.confirm("Are you sure you want to remove this image?", name).then(function(ok) {
if (ok) {
- tools.httpPost("/api/msd/remove", {"image": name}, function(http) {
+ tools.httpPost("api/msd/remove", {"image": name}, function(http) {
if (http.status !== 200) {
wm.error("Can't remove image", http.responseText);
}
@@ -287,7 +288,7 @@ export function Msd() {
};
var __sendParam = function(name, value) {
- tools.httpPost("/api/msd/set_params", {[name]: value}, function(http) {
+ tools.httpPost("api/msd/set_params", {[name]: value}, function(http) {
if (http.status !== 200) {
wm.error("Can't configure Mass Storage", http.responseText);
}
@@ -301,10 +302,10 @@ export function Msd() {
let prefix = encodeURIComponent($("msd-new-part-selector").value);
if (file) {
let image = encodeURIComponent(file.name);
- __http.open("POST", `/api/msd/write?prefix=${prefix}&image=${image}&remove_incomplete=1`, true);
+ __http.open("POST", `${ROOT_PREFIX}api/msd/write?prefix=${prefix}&image=${image}&remove_incomplete=1`, true);
} else {
let url = encodeURIComponent($("msd-new-url").value);
- __http.open("POST", `/api/msd/write_remote?prefix=${prefix}&url=${url}&remove_incomplete=1`, true);
+ __http.open("POST", `${ROOT_PREFIX}api/msd/write_remote?prefix=${prefix}&url=${url}&remove_incomplete=1`, true);
}
__http.upload.timeout = 7 * 24 * 3600;
__http.onreadystatechange = __uploadStateChange;
@@ -360,7 +361,7 @@ export function Msd() {
};
var __clickConnectButton = function(connected) {
- tools.httpPost("/api/msd/set_connected", {"connected": connected}, function(http) {
+ tools.httpPost("api/msd/set_connected", {"connected": connected}, function(http) {
if (http.status !== 200) {
wm.error("Can't switch Mass Storage", http.responseText);
}
@@ -373,7 +374,7 @@ export function Msd() {
var __clickResetButton = function() {
wm.confirm("Are you sure you want to reset Mass Storage?").then(function(ok) {
if (ok) {
- tools.httpPost("/api/msd/reset", null, function(http) {
+ tools.httpPost("api/msd/reset", null, function(http) {
if (http.status !== 200) {
wm.error("Mass Storage reset error", http.responseText);
}
diff --git a/web/share/js/kvm/ocr.js b/web/share/js/kvm/ocr.js
index b490956b..00f6dd3c 100644
--- a/web/share/js/kvm/ocr.js
+++ b/web/share/js/kvm/ocr.js
@@ -186,7 +186,7 @@ export function Ocr(__getGeometry) {
"ocr_right": __sel.right,
"ocr_bottom": __sel.bottom,
};
- tools.httpGet("/api/streamer/snapshot", params, function(http) {
+ tools.httpGet("api/streamer/snapshot", params, function(http) {
if (http.status === 200) {
wm.copyTextToClipboard(http.responseText);
} else {
diff --git a/web/share/js/kvm/paste.js b/web/share/js/kvm/paste.js
index f42fa22c..2714c158 100644
--- a/web/share/js/kvm/paste.js
+++ b/web/share/js/kvm/paste.js
@@ -72,7 +72,7 @@ export function Paste(__recorder) {
tools.debug(`HID: paste-as-keys ${keymap}: ${text}`);
- tools.httpPost("/api/hid/print", {"limit": 0, "keymap": keymap, "slow": slow}, function(http) {
+ tools.httpPost("api/hid/print", {"limit": 0, "keymap": keymap, "slow": slow}, function(http) {
tools.el.setEnabled($("hid-pak-text"), true);
tools.el.setEnabled($("hid-pak-button"), true);
tools.el.setEnabled($("hid-pak-keymap-selector"), true);
diff --git a/web/share/js/kvm/recorder.js b/web/share/js/kvm/recorder.js
index cf792bc2..2091e9a4 100644
--- a/web/share/js/kvm/recorder.js
+++ b/web/share/js/kvm/recorder.js
@@ -293,7 +293,7 @@ export function Recorder() {
if (event.event.slow !== undefined) {
params["slow"] = event.event.slow;
}
- tools.httpPost("/api/hid/print", params, function(http) {
+ tools.httpPost("api/hid/print", params, function(http) {
if (http.status === 413) {
wm.error("Too many text for paste!");
__stopProcess();
@@ -307,7 +307,7 @@ export function Recorder() {
return;
} else if (event.event_type === "atx_button") {
- tools.httpPost("/api/atx/click", {"button": event.event.button}, function(http) {
+ tools.httpPost("api/atx/click", {"button": event.event.button}, function(http) {
if (http.status !== 200) {
wm.error("ATX error", http.responseText);
__stopProcess();
@@ -318,7 +318,7 @@ export function Recorder() {
return;
} else if (["gpio_switch", "gpio_pulse"].includes(event.event_type)) {
- let path = "/api/gpio";
+ let path = "api/gpio";
let params = {"channel": event.event.channel};
if (event.event_type === "gpio_switch") {
path += "/switch";
diff --git a/web/share/js/kvm/session.js b/web/share/js/kvm/session.js
index fcf20ded..9e944e81 100644
--- a/web/share/js/kvm/session.js
+++ b/web/share/js/kvm/session.js
@@ -23,6 +23,7 @@
"use strict";
+import {ROOT_PREFIX} from "../vars.js";
import {tools, $} from "../tools.js";
import {wm} from "../wm.js";
@@ -272,10 +273,15 @@ export function Session() {
let close_hook = null;
let has_webterm = (state.webterm && (state.webterm.enabled || state.webterm.started));
if (has_webterm) {
- let path = "/" + state.webterm.path + "?disableLeaveAlert=true";
+ let loc = window.location;
+ let base = `${loc.protocol}//${loc.host}${loc.pathname}${ROOT_PREFIX}`;
+ // Tailing slash after state.webterm.path is added to avoid Nginx 301 redirect
+ // when the location doesn't have tailing slash: "foo -> foo/".
+ // Reverse proxy over PiKVM can be misconfigured to handle this.
+ let url = base + state.webterm.path + "/?disableLeaveAlert=true";
show_hook = function() {
- tools.info("Terminal opened: ", path);
- $("webterm-iframe").src = path;
+ tools.info("Terminal opened: ", url);
+ $("webterm-iframe").src = url;
};
close_hook = function() {
tools.info("Terminal closed");
@@ -291,9 +297,9 @@ export function Session() {
$("link-led").className = "led-yellow";
$("link-led").title = "Connecting...";
- tools.httpGet("/api/auth/check", null, function(http) {
+ tools.httpGet("api/auth/check", null, function(http) {
if (http.status === 200) {
- __ws = new WebSocket(`${tools.is_https ? "wss" : "ws"}://${location.host}/api/ws`);
+ __ws = new WebSocket(tools.makeWsUrl("api/ws"));
__ws.sendHidEvent = (event) => __sendHidEvent(__ws, event.event_type, event.event);
__ws.onopen = __wsOpenHandler;
__ws.onmessage = __wsMessageHandler;
@@ -302,7 +308,7 @@ export function Session() {
} else if (http.status === 401 || http.status === 403) {
window.onbeforeunload = () => null;
wm.error("Unexpected logout occured, please login again").then(function() {
- document.location.href = "/login";
+ tools.currentOpen("login");
});
} else {
__wsCloseHandler(null);
diff --git a/web/share/js/kvm/stream.js b/web/share/js/kvm/stream.js
index 2de3d469..9df3c4b6 100644
--- a/web/share/js/kvm/stream.js
+++ b/web/share/js/kvm/stream.js
@@ -332,19 +332,14 @@ export function Streamer() {
};
var __clickScreenshotButton = function() {
- let el = document.createElement("a");
- el.href = "/api/streamer/snapshot";
- el.target = "_blank";
- document.body.appendChild(el);
- el.click();
- setTimeout(() => document.body.removeChild(el), 0);
+ tools.windowOpen("api/streamer/snapshot");
};
var __clickResetButton = function() {
wm.confirm("Are you sure you want to reset stream?").then(function(ok) {
if (ok) {
__resetStream();
- tools.httpPost("/api/streamer/reset", null, function(http) {
+ tools.httpPost("api/streamer/reset", null, function(http) {
if (http.status !== 200) {
wm.error("Can't reset stream", http.responseText);
}
@@ -354,7 +349,7 @@ export function Streamer() {
};
var __sendParam = function(name, value) {
- tools.httpPost("/api/streamer/set_params", {[name]: value}, function(http) {
+ tools.httpPost("api/streamer/set_params", {[name]: value}, function(http) {
if (http.status !== 200) {
wm.error("Can't configure stream", http.responseText);
}
diff --git a/web/share/js/kvm/stream_janus.js b/web/share/js/kvm/stream_janus.js
index 449450b7..3e9ea5dd 100644
--- a/web/share/js/kvm/stream_janus.js
+++ b/web/share/js/kvm/stream_janus.js
@@ -96,7 +96,7 @@ export function JanusStreamer(__setActive, __setInactive, __setInfo, __orient, _
__setInfo(false, false, "");
__logInfo("Starting Janus ...");
__janus = new _Janus({
- "server": `${tools.is_https ? "wss" : "ws"}://${location.host}/janus/ws`,
+ "server": tools.makeWsUrl("janus/ws"),
"ipv6": true,
"destroyOnUnload": false,
"success": __attachJanus,
diff --git a/web/share/js/kvm/stream_media.js b/web/share/js/kvm/stream_media.js
index 89df9c28..ae751f9d 100644
--- a/web/share/js/kvm/stream_media.js
+++ b/web/share/js/kvm/stream_media.js
@@ -79,7 +79,7 @@ export function MediaStreamer(__setActive, __setInactive, __setInfo) {
__setInactive();
__setInfo(false, false, "");
__logInfo("Starting Media ...");
- __ws = new WebSocket(`${tools.is_https ? "wss" : "ws"}://${location.host}/api/media/ws`);
+ __ws = new WebSocket(tools.makeWsUrl("api/media/ws"));
__ws.binaryType = "arraybuffer";
__ws.onopen = __wsOpenHandler;
__ws.onerror = __wsErrorHandler;
diff --git a/web/share/js/kvm/stream_mjpeg.js b/web/share/js/kvm/stream_mjpeg.js
index 1fd1548e..a13e708e 100644
--- a/web/share/js/kvm/stream_mjpeg.js
+++ b/web/share/js/kvm/stream_mjpeg.js
@@ -23,6 +23,7 @@
"use strict";
+import {ROOT_PREFIX} from "../vars.js";
import {tools, $} from "../tools.js";
@@ -72,7 +73,7 @@ export function MjpegStreamer(__setActive, __setInactive, __setInfo) {
self.stopStream = function() {
self.ensureStream(null);
- let blank = "/share/png/blank-stream.png";
+ let blank = `${ROOT_PREFIX}share/png/blank-stream.png`;
if (!String.prototype.endsWith.call($("stream-image").src, blank)) {
$("stream-image").src = blank;
}
@@ -138,7 +139,7 @@ export function MjpegStreamer(__setActive, __setInactive, __setInfo) {
__setStreamInactive();
__stopChecking();
- let path = `/streamer/stream?key=${__key}`;
+ let path = `${ROOT_PREFIX}streamer/stream?key=${__key}`;
if (tools.browser.is_safari || tools.browser.is_ios) {
// uStreamer fix for WebKit
__logInfo("Using dual_final_frames=1 to fix WebKit bugs");
diff --git a/web/share/js/kvm/switch.js b/web/share/js/kvm/switch.js
index 8187a22c..1ed9adca 100644
--- a/web/share/js/kvm/switch.js
+++ b/web/share/js/kvm/switch.js
@@ -23,6 +23,7 @@
"use strict";
+import {ROOT_PREFIX} from "../vars.js";
import {tools, $} from "../tools.js";
import {wm} from "../wm.js";
@@ -125,7 +126,7 @@ export function Switch() {
+ ":" + brightness.toString(16).padStart(2, "0")
+ ":" + color.blink_ms.toString(16).padStart(4, "0")
);
- __sendPost("/api/switch/set_colors", {[role]: rgbx}, function() {
+ __sendPost("api/switch/set_colors", {[role]: rgbx}, function() {
el_color.value = (
"#"
+ color.red.toString(16).padStart(2, "0")
@@ -137,7 +138,7 @@ export function Switch() {
};
var __clickSetDefaultColorButton = function(role) {
- __sendPost("/api/switch/set_colors", {[role]: "default"});
+ __sendPost("api/switch/set_colors", {[role]: "default"});
};
var __applyEdids = function(edids) {
@@ -210,7 +211,7 @@ export function Switch() {
if (ok) {
let name = $("__switch-edid-new-name-input").value;
let data = $("__switch-edid-new-data-text").value;
- __sendPost("/api/switch/edids/create", {"name": name, "data": data});
+ __sendPost("api/switch/edids/create", {"name": name, "data": data});
}
});
};
@@ -222,7 +223,7 @@ export function Switch() {
let html = "Are you sure to remove this EDID?
Ports that used it will change it to the default."; wm.confirm(html, name).then(function(ok) { if (ok) { - __sendPost("/api/switch/edids/remove", {"id": edid_id}); + __sendPost("api/switch/edids/remove", {"id": edid_id}); } }); } @@ -344,11 +345,11 @@ export function Switch() {@@ -365,10 +366,10 @@ export function Switch() { - 
- 
- 
- 
+ 
+ 
+ 
+ 