GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-30 01:21:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed loadInitialState()

Browse Source
This commit is contained in:
Devaev Maxim
2018-11-24 06:30:08 +03:00
parent d060125cd3
commit c168e73805
6 changed files with 55 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/js/kvm/atx.js
View File

@@ -14,18 +14,6 @@ function Atx() {
/********************************************************************************/
self.loadInitialState = function() {
var http = tools.makeRequest("GET", "/kvmd/atx", function() {
if (http.readyState === 4) {
if (http.status === 200) {
__setButtonsBusy(JSON.parse(http.responseText).result.busy);
} else {
setTimeout(self.loadInitialState, 1000);
}
}
});
};
self.setState = function(state) {
__setButtonsBusy(state.busy);
$("atx-power-led").className = (state.leds.power ? "led-green" : "led-gray");

12
web/js/kvm/msd.js
View File

@@ -24,18 +24,6 @@ function Msd() {
/********************************************************************************/
self.loadInitialState = function() {
var http = tools.makeRequest("GET", "/kvmd/msd", function() {
if (http.readyState === 4) {
if (http.status === 200) {
self.setState(JSON.parse(http.responseText).result);
} else {
setTimeout(self.loadInitialState, 1000);
}
}
});
};
self.setState = function(state) {
__state = state;
__applyState();

51
web/js/kvm/session.js
View File

@@ -15,39 +15,29 @@ function Session() {
var __init__ = function() {
$("link-led").title = "Not connected yet...";
__loadKvmdInfo();
__startPoller();
};
/********************************************************************************/
var __loadKvmdInfo = function() {
var http = tools.makeRequest("GET", "/kvmd/info", function() {
if (http.readyState === 4) {
if (http.status === 200) {
var info = JSON.parse(http.responseText).result;
if (info.meta) {
var text = JSON.stringify(info.meta, undefined, 4).replace(/ /g, "&nbsp;").replace(/\n/g, "<br>");
$("about-meta").innerHTML = `
<span class="code-comment">// The Pi-KVM metadata.<br>
// You can get this json using handle /kvmd/info.<br>
// In the standard configuration this data<br>
// is specified in the file /etc/kvmd/meta.yaml.</span><br>
<br>
${text}
`;
if (info.meta.server && info.meta.server.host) {
document.title = "Pi-KVM Session - " + info.meta.server.host;
$("kvmd-meta-server-host").innerHTML = "Server: " + info.meta.server.host;
}
}
$("about-version-kvmd").innerHTML = info.version.kvmd;
$("about-version-streamer").innerHTML = `${info.version.streamer} (${info.streamer})`;
} else {
setTimeout(__loadKvmdInfo, 1000);
}
var __setKvmdInfo = function(state) {
if (state.meta) {
var text = JSON.stringify(state.meta, undefined, 4).replace(/ /g, "&nbsp;").replace(/\n/g, "<br>");
$("about-meta").innerHTML = `
<span class="code-comment">// The Pi-KVM metadata.<br>
// You can get this json using handle <a target="_blank" href="/kvmd/info">/kvmd/info</a>.<br>
// In the standard configuration this data<br>
// is specified in the file /etc/kvmd/meta.yaml.</span><br>
<br>
${text}
`;
if (state.meta.server && state.meta.server.host) {
document.title = "Pi-KVM Session - " + state.meta.server.host;
$("kvmd-meta-server-host").innerHTML = "Server: " + state.meta.server.host;
}
});
}
$("about-version-kvmd").innerHTML = state.version.kvmd;
$("about-version-streamer").innerHTML = `${state.version.streamer} (${state.streamer})`;
};
var __startPoller = function() {
@@ -73,9 +63,6 @@ function Session() {
$("link-led").className = "led-green";
$("link-led").title = "Connected";
tools.debug("Session: socket opened:", event);
__streamer.loadInitialState();
__atx.loadInitialState();
__msd.loadInitialState();
__hid.setSocket(__ws);
__missed_heartbeats = 0;
__ping_timer = setInterval(__pingServer, 1000);
@@ -87,7 +74,9 @@ function Session() {
if (event.msg_type === "pong") {
__missed_heartbeats = 0;
} else if (event.msg_type === "event") {
if (event.msg.event === "streamer_state") {
if (event.msg.event === "info_state") {
__setKvmdInfo(event.msg.event_attrs);
} else if (event.msg.event === "streamer_state") {
__streamer.setState(event.msg.event_attrs);
} else if (event.msg.event === "atx_state") {
__atx.setState(event.msg.event_attrs);

13
web/js/kvm/stream.js
View File

@@ -38,19 +38,6 @@ function Streamer() {
/********************************************************************************/
self.loadInitialState = function() {
var http = tools.makeRequest("GET", "/kvmd/streamer", function() {
if (http.readyState === 4) {
if (http.status === 200) {
self.setState(JSON.parse(http.responseText).result);
} else {
self.clearState();
setTimeout(self.loadInitialState, 1000);
}
}
});
};
self.setState = function(state) {
if (state.state) {
var source = state.state.source;