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

refactoring

Browse Source
This commit is contained in:
Maxim Devaev 2023-03-18 17:51:04 +02:00
parent 94d2f20d1f
commit 097dbc517d
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
web/share/js/kvm/msd.js
View File

@ -342,38 +342,24 @@ export function Msd() {
} }
let s = __state; let s = __state;
let selected_index = 0; let selected = "";
let index = 1;
for (let name of Object.keys(s.storage.images).sort()) { for (let name of Object.keys(s.storage.images).sort()) {
let image = s.storage.images[name]; tools.selector.addSeparator(el);
tools.selector.addOption(el, name, name);
if (!tools.browser.is_mobile) { tools.selector.addComment(el, __makeImageSelectorInfo(s.storage.images[name]));
let separator = new Option("\u2500".repeat(30), false, false);
separator.disabled = true;
separator.className = "comment";
el.options[index] = separator;
++index;
}
let option = new Option(name, name, false, false);
el.options[index] = option;
if (s.drive.image && s.drive.image.name === name && s.drive.image.in_storage) { if (s.drive.image && s.drive.image.name === name && s.drive.image.in_storage) {
selected_index = index; selected = name;
} }
++index;
el.options[index] = __makeImageSelectorInfo(image);
++index;
} }
if (s.drive.image && !s.drive.image.in_storage) { if (s.drive.image && !s.drive.image.in_storage) {
el.options[index] = new Option(s.drive.image.name, "", false, false); selected = ".__external";
el.options[index + 1] = __makeImageSelectorInfo(s.drive.image); tools.selector.addOption(el, s.drive.image.name, selected);
selected_index = el.options.length - 2; tools.selector.addComment(el, __makeImageSelectorInfo(s.drive.image));
} }
el.selectedIndex = selected_index; el.value = selected;
}; };
var __makeImageSelectorInfo = function(image) { var __makeImageSelectorInfo = function(image) {
@ -382,15 +368,10 @@ export function Msd() {
if (image.in_storage !== undefined && !image.in_storage) { if (image.in_storage !== undefined && !image.in_storage) {
title += ", out of storage"; title += ", out of storage";
} }
let dt = new Date(image.mod_ts * 1000); let dt = new Date(image.mod_ts * 1000);
dt = new Date(dt.getTime() - (dt.getTimezoneOffset() * 60000)); dt = new Date(dt.getTime() - (dt.getTimezoneOffset() * 60000));
title += " \u2500 " + dt.toISOString().slice(0, -8).replaceAll("-", ".").replace("T", "-"); title += " \u2500 " + dt.toISOString().slice(0, -8).replaceAll("-", ".").replace("T", "-");
return title;
let el = new Option(title, "", false, false);
el.disabled = true;
el.className = "comment";
return el;
}; };
var __applyStatePartSelector = function() { var __applyStatePartSelector = function() {
@ -400,17 +381,15 @@ export function Msd() {
} }
for (let name of Object.keys(__state.storage.parts).sort()) { for (let name of Object.keys(__state.storage.parts).sort()) {
if (name != "" && __state.storage.parts[name].writable) { if (name != "" && __state.storage.parts[name].writable) {
el.add(new Option(name, name, false, false)); tools.selector.addOption(el, name, name);
} }
} }
console.log(el.options);
tools.hidden.setVisible($("msd-new-part"), (el.options.length > 1)); tools.hidden.setVisible($("msd-new-part"), (el.options.length > 1));
}; };
var __prepareSelector = function(el, first) { var __prepareSelector = function(el, first) {
let s = __state; let s = __state;
let online = (s && s.online); let online = (s && s.online);
if (!online) { if (!online) {
el.options.length = 1; // Cleanup el.options.length = 1; // Cleanup
return false; return false;
@ -418,12 +397,7 @@ export function Msd() {
if (s.storage.uploading || s.storage.downloading) { if (s.storage.uploading || s.storage.downloading) {
return false; return false;
} }
tools.selector.initDefault(el, first, "");
if (el.options.length === 0) {
el.options[0] = new Option(`\u2500 ${first} \u2500`, "", false, false);
} else {
el.options.length = 1;
}
return true; return true;
}; };

26
web/share/js/tools.js
View File

@ -251,6 +251,32 @@ export var tools = new function() {
}; };
}; };
self.selector = new function() {
return {
"initDefault": function(el, title, value) {
if (el.options.length === 0) {
self.selector.addOption(el, `\u2500 ${title} \u2500`, value);
} else {
el.options.length = 1;
}
},
"addOption": function(el, title, value) {
el.add(new Option(title, value, false, false));
},
"addComment": function(el, title) {
let option = new Option(title, ".".repeat(30), false, false); // Kinda magic value
option.disabled = true;
option.className = "comment";
el.add(option);
},
"addSeparator": function(el) {
if (!self.browser.is_mobile) {
self.selector.addComment(el, "\u2500".repeat(30));
}
},
};
};
self.progress = new function() { self.progress = new function() {
return { return {
"setValue": function(el, title, percent) { "setValue": function(el, title, percent) {