refactoring

This commit is contained in:
Devaev Maxim 2020-07-11 01:58:07 +03:00
parent e390914c7e
commit 01fee4992b
6 changed files with 33 additions and 21 deletions

View File

@ -155,7 +155,7 @@
Mass Storage ↴ Mass Storage ↴
</a> </a>
<div data-dont-hide-menu id="msd-menu" class="menu-item-content"> <div data-dont-hide-menu id="msd-menu" class="menu-item-content">
<div id="msd-message-offline" class="msd-message"> <div id="msd-message-offline" class="hidden">
<div class="menu-item-content-text"> <div class="menu-item-content-text">
<table> <table>
<tr> <tr>
@ -166,7 +166,7 @@
</div> </div>
<hr> <hr>
</div> </div>
<div id="msd-message-image-broken" class="msd-message"> <div id="msd-message-image-broken" class="hidden">
<div class="menu-item-content-text"> <div class="menu-item-content-text">
<table> <table>
<tr> <tr>
@ -177,7 +177,7 @@
</div> </div>
<hr> <hr>
</div> </div>
<div id="msd-message-too-big-for-cdrom" class="msd-message"> <div id="msd-message-too-big-for-cdrom" class="hidden">
<div class="menu-item-content-text"> <div class="menu-item-content-text">
<table> <table>
<tr> <tr>
@ -188,7 +188,7 @@
</div> </div>
<hr> <hr>
</div> </div>
<div id="msd-message-out-of-storage" class="msd-message"> <div id="msd-message-out-of-storage" class="hidden">
<div class="menu-item-content-text"> <div class="menu-item-content-text">
<table> <table>
<tr> <tr>
@ -199,7 +199,7 @@
</div> </div>
<hr> <hr>
</div> </div>
<div id="msd-message-another-user-uploads" class="msd-message"> <div id="msd-message-another-user-uploads" class="hidden">
<div class="menu-item-content-text"> <div class="menu-item-content-text">
<table> <table>
<tr> <tr>
@ -265,7 +265,7 @@
<hr> <hr>
</div> </div>
<input type="file" id="msd-select-new-image-file" class="msd-message" /> <input type="file" id="msd-select-new-image-file" class="hidden" />
<div class="menu-item-content-buttons buttons-row"> <div class="menu-item-content-buttons buttons-row">
<button disabled id="msd-select-new-image-button" class="row50">Upload new image</button> <button disabled id="msd-select-new-image-button" class="row50">Upload new image</button>
<button disabled id="msd-upload-new-image-button" class="row25">Start</button> <button disabled id="msd-upload-new-image-button" class="row25">Start</button>
@ -273,7 +273,7 @@
</div> </div>
<hr> <hr>
<div id="msd-submenu-new-image" class="msd-message"> <div id="msd-submenu-new-image" class="hidden">
<table class="menu-item-content-kv"> <table class="menu-item-content-kv">
<tr> <tr>
<td>New image:</td> <td>New image:</td>

View File

@ -243,3 +243,7 @@ ul.footer li a {
.feature-disabled { .feature-disabled {
display: none; display: none;
} }
.hidden {
display: none;
}

View File

@ -45,7 +45,7 @@ export function Atx() {
self.setState = function(state) { self.setState = function(state) {
if (state) { if (state) {
$("atx-dropdown").classList.toggle("feature-disabled", !state.enabled); tools.setFeatureEnabled($("atx-dropdown"), state.enabled);
} }
$("atx-power-led").className = ((state && state.leds.power) ? "led-green" : "led-gray"); $("atx-power-led").className = ((state && state.leds.power) ? "led-green" : "led-gray");

View File

@ -183,8 +183,8 @@ export function Msd() {
var __applyState = function() { var __applyState = function() {
if (__state) { if (__state) {
__toggleMsdFeatures(); __toggleMsdFeatures();
$("msd-dropdown").classList.toggle("feature-disabled", !__state.enabled); tools.setFeatureEnabled($("msd-dropdown"), __state.enabled);
$("msd-reset-button").classList.toggle("feature-disabled", !__state.enabled); tools.setFeatureEnabled($("msd-reset-button"), __state.enabled);
__showMessageOffline(!__state.online); __showMessageOffline(!__state.online);
__showMessageImageBroken(__state.online && __state.drive.image && !__state.drive.image.complete && !__state.storage.uploading); __showMessageImageBroken(__state.online && __state.drive.image && !__state.drive.image.complete && !__state.storage.uploading);
@ -236,7 +236,7 @@ export function Msd() {
wm.switchEnabled($("msd-reset-button"), (__state.enabled && !__state.busy)); wm.switchEnabled($("msd-reset-button"), (__state.enabled && !__state.busy));
$("msd-submenu-new-image").style.display = (__image_file ? "block" : "none"); tools.setHiddenVisible($("msd-submenu-new-image"), __image_file);
$("msd-new-image-name").innerHTML = (__image_file ? __image_file.name : ""); $("msd-new-image-name").innerHTML = (__image_file ? __image_file.name : "");
$("msd-new-image-size").innerHTML = (__image_file ? tools.formatSize(__image_file.size) : ""); $("msd-new-image-size").innerHTML = (__image_file ? tools.formatSize(__image_file.size) : "");
if (!__upload_http) { if (!__upload_http) {
@ -274,7 +274,7 @@ export function Msd() {
wm.switchEnabled($("msd-reset-button"), false); wm.switchEnabled($("msd-reset-button"), false);
$("msd-select-new-image-file").value = ""; $("msd-select-new-image-file").value = "";
$("msd-submenu-new-image").style.display = "none"; tools.setHiddenVisible($("msd-submenu-new-image"), false);
$("msd-new-image-name").innerHTML = ""; $("msd-new-image-name").innerHTML = "";
$("msd-new-image-size").innerHTML = ""; $("msd-new-image-size").innerHTML = "";
tools.setProgressPercent($("msd-uploading-progress"), "", 0); tools.setProgressPercent($("msd-uploading-progress"), "", 0);
@ -283,34 +283,34 @@ export function Msd() {
var __toggleMsdFeatures = function() { var __toggleMsdFeatures = function() {
for (let el of $$$(".msd-single-storage")) { for (let el of $$$(".msd-single-storage")) {
el.classList.toggle("feature-disabled", __state.features.multi); tools.setFeatureEnabled(el, !__state.features.multi);
} }
for (let el of $$$(".msd-multi-storage")) { for (let el of $$$(".msd-multi-storage")) {
el.classList.toggle("feature-disabled", !__state.features.multi); tools.setFeatureEnabled(el, __state.features.multi);
} }
for (let el of $$$(".msd-cdrom-emulation")) { for (let el of $$$(".msd-cdrom-emulation")) {
el.classList.toggle("feature-disabled", !__state.features.cdrom); tools.setFeatureEnabled(el, __state.features.cdrom);
} }
}; };
var __showMessageOffline = function(visible) { var __showMessageOffline = function(visible) {
$("msd-message-offline").style.display = (visible ? "block" : "none"); tools.setHiddenVisible($("msd-message-offline"), visible);
}; };
var __showMessageImageBroken = function(visible) { var __showMessageImageBroken = function(visible) {
$("msd-message-image-broken").style.display = (visible ? "block" : "none"); tools.setHiddenVisible($("msd-message-image-broken"), visible);
}; };
var __showMessageTooBigForCdrom = function(visible) { var __showMessageTooBigForCdrom = function(visible) {
$("msd-message-too-big-for-cdrom").style.display = (visible ? "block" : "none"); tools.setHiddenVisible($("msd-message-too-big-for-cdrom"), visible);
}; };
var __showMessageOutOfStorage = function(visible) { var __showMessageOutOfStorage = function(visible) {
$("msd-message-out-of-storage").style.display = (visible ? "block" : "none"); tools.setHiddenVisible($("msd-message-out-of-storage"), visible);
}; };
var __showMessageAnotherUserUploads = function(visible) { var __showMessageAnotherUserUploads = function(visible) {
$("msd-message-another-user-uploads").style.display = (visible ? "block" : "none"); tools.setHiddenVisible($("msd-message-another-user-uploads"), visible);
}; };
var __setStatus = function(led_cls, msg) { var __setStatus = function(led_cls, msg) {

View File

@ -42,7 +42,7 @@ export function WakeOnLan() {
self.setState = function(state) { self.setState = function(state) {
if (state) { if (state) {
$("wol").classList.toggle("feature-disabled", !state.enabled); tools.setFeatureEnabled($("wol"), state.enabled);
__target = state.target; __target = state.target;
} }
wm.switchEnabled($("wol-wakeup-button"), (state && state.enabled)); wm.switchEnabled($("wol-wakeup-button"), (state && state.enabled));

View File

@ -139,6 +139,14 @@ export var tools = new function() {
$(`${el.id}-value`).style.width = `${percent}%`; $(`${el.id}-value`).style.width = `${percent}%`;
}; };
this.setHiddenVisible = function(el, visible) {
el.classList.toggle("hidden", !visible);
};
this.setFeatureEnabled = function(el, enabled) {
el.classList.toggle("feature-disabled", !enabled);
};
/************************************************************************/ /************************************************************************/
let __debug = (new URL(window.location.href)).searchParams.get("debug"); let __debug = (new URL(window.location.href)).searchParams.get("debug");