@@ -1086,6 +1172,7 @@
var sessionActivity = Date.now();
var deskPinchZoom;
var deskKeyboardShortcuts = [];
+ var nightMode = setNightMode();
// Console Message Display Timers
var p11DeskConsoleMsgTimer = null;
@@ -1111,6 +1198,7 @@
document.onkeypress = ondeskkeypress;
document.onkeydown = ondeskkeydown;
document.onkeyup = ondeskkeyup;
+ document.onclick = function (e) { if ((xxdialogMode == 999) && (e.target.id != 'topMenuIcon')) { QV('topMenu', false); xxdialogMode = 0; } }
// Connect to the mesh server
meshserver = MeshServerCreateControl(domainUrl, authCookie);
@@ -1867,6 +1955,35 @@
// MY ACCOUNT
//
+ function toggleNightMode() {
+ if (xxdialogMode) return;
+ var cNightMode = getstore('nightMode', '0');
+ var x = '
';
+ setDialogMode(2, "Night Mode", 3, toggleNightModeEx, x);
+ QV('uiMenu', false);
+ }
+
+ function toggleNightModeEx() {
+ // Save new night mode
+ var nNightMode = '0';
+ if (Q('night1').checked) { nNightMode = '1'; }
+ if (Q('night2').checked) { nNightMode = '2'; }
+ putstore('nightMode', nNightMode);
+ setNightMode();
+ }
+
+ function setNightMode() {
+ // Set night mode
+ var nNightMode = getstore('nightMode', '0')
+ nightMode = false;
+ if (nNightMode == '1') { nightMode = true; }
+ else if ((nNightMode == '0') && (window.matchMedia)) { nightMode = window.matchMedia('(prefers-color-scheme: dark)').matches }
+ if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; QS('body')['color'] = 'lightgray'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#FFF'; QS('body')['color'] = 'black'; }
+ return nightMode;
+ }
+
function account_managePhone() {
if (xxdialogMode || ((features & 0x02000000) == 0)) return;
var x;
@@ -2093,8 +2210,8 @@
// Print the mesh information
r += '
';
r += '
';
- r += '
';
- r += '
' + EscapeHtml(meshes[i].name) + '
' + rights + '
';
+ r += '
';
+ r += '
' + EscapeHtml(meshes[i].name) + '
' + rights + '
';
r += '
';
}
@@ -2121,7 +2238,7 @@
function updateFiles() {
QV('MainMenuMyFiles', ((features & 8) == 0));
if ((features & 8) != 0) return; // If running on a server without files, exit now.
- var html1 = '', html2 = '', displayPath = '
' + "Root" + '', fullPath = 'Root', publicPath, filetreex = filetree, folderdepth = 1;
+ var html1 = '', html2 = '', displayPath = '
' + "Root" + '', fullPath = 'Root', publicPath, filetreex = filetree, folderdepth = 1;
// Navigate to path location, build the paths at the same time
var filetreelocation2 = [], oldlinkpath = filetreelinkpath, checkedBoxes = [], checkboxes = document.getElementsByName('fc');
@@ -2141,7 +2258,7 @@
if (filetreelinkpath != '') { filetreelinkpath += '/' + filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + filetreelocation[i]; } }
}
filetreex = filetreex.f[filetreelocation[i]];
- displayPath += ' /
' + EscapeHtml(filetreex.n != null ? filetreex.n : filetreelocation[i]) + '';
+ displayPath += ' /
' + EscapeHtml(filetreex.n != null ? filetreex.n : filetreelocation[i]) + '';
folderdepth++;
} else {
break;
@@ -4000,13 +4117,13 @@
}
function p13updateFiles(checkedNames) {
- var html1 = '', html2 = '', displayPath = '
' + "Root" + '', fullPath = 'Root';
+ var html1 = '', html2 = '', displayPath = '
' + "Root" + '', fullPath = 'Root';
// Work on parsing the file path
var x = p13filetree.path.split('\\');
p13filetreelocation = [];
for (var i in x) { if (x[i] != '') { p13filetreelocation.push(x[i]); } } // Remove empty spaces
- for (var i in p13filetreelocation) { displayPath += ' /
' + EscapeHtml(p13filetreelocation[i]) + '' } // Setup the path we display
+ for (var i in p13filetreelocation) { displayPath += ' /
' + EscapeHtml(p13filetreelocation[i]) + '' } // Setup the path we display
var newlinkpath = p13filetreelocation.join('/');
// Sort the files
@@ -5482,7 +5599,7 @@
function addHtmlValue(t, v) { return '
'; }
function addHtmlValue2(t, v) { return '
'; }
function addHtmlValue4(t, v) { return '
'; }
- function addLink(x, f) { return '
♦ ' + x + ''; }
+ function addLink(x, f) { return '
♦ ' + x + ''; }
function addLinkConditional(x, f, c) { if (c) return addLink(x, f); return x; }
function passwordcheck(p) { var re = /(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%^&*()]).{8,}/; return re.test(p); }
function getFileSizeStr(size) { if (typeof size != 'number') { size = 0; } if (size == 1) return "1 byte"; return format('{0} bytes', size); }
diff --git a/views/default.handlebars b/views/default.handlebars
index d7bcfda0..43eb4547 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -1305,7 +1305,7 @@
var uiMode = parseInt(getstore('uiMode', 1));
var webPageStackMenu = false;
var webPageFullScreen = true;
- var nightMode = (getstore('nightMode', '0') == '1');
+ var nightMode = setNightMode();
var footerBar = (getstore('footerBar', '1') == '1');
var sessionActivity = Date.now();
var updateSessionTimer = null;
@@ -1749,6 +1749,7 @@
// Toggle user interface menu
function showUserInterfaceSelectMenu() {
+ if (xxdialogMode) return;
Q('uiViewButton1').classList.remove('uiSelectorSel');
Q('uiViewButton2').classList.remove('uiSelectorSel');
Q('uiViewButton3').classList.remove('uiSelectorSel');
@@ -1772,9 +1773,32 @@
}
function toggleNightMode() {
- nightMode = !nightMode;
+ if (xxdialogMode) return;
+ var cNightMode = getstore('nightMode', '0');
+ var x = '
';
+ x += '
';
+ x += '
';
+ setDialogMode(2, "Night Mode", 3, toggleNightModeEx, x);
+ QV('uiMenu', false);
+ }
+
+ function toggleNightModeEx() {
+ // Save new night mode
+ var nNightMode = '0';
+ if (Q('night1').checked) { nNightMode = '1'; }
+ if (Q('night2').checked) { nNightMode = '2'; }
+ putstore('nightMode', nNightMode);
+ setNightMode();
+ }
+
+ function setNightMode() {
+ // Set night mode
+ var nNightMode = getstore('nightMode', '0')
+ nightMode = false;
+ if (nNightMode == '1') { nightMode = true; }
+ else if ((nNightMode == '0') && (window.matchMedia)) { nightMode = window.matchMedia('(prefers-color-scheme: dark)').matches }
if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; }
- putstore('nightMode', nightMode?'1':'0');
+ return nightMode;
}
function toggleFooterBarMode() {
@@ -2613,7 +2637,7 @@
if ((webstate.uiMode != null) && (webstate.uiMode != oldUiMode)) { userInterfaceSelectMenu(parseInt(webstate.uiMode)); }
if ((webstate.sort != null) && (webstate.sort != oldSort)) { document.getElementById('sortselect').selectedIndex = sort = parseInt(webstate.sort); mainUpdate(6); }
if ((webstate.loctag != null) && (webstate.loctag != oldLoctag)) { if (webstate.loctag != null) { args.locale = webstate.loctag; } else { delete args.locale; } mainUpdate(0xFFFFFFFF); }
- if ((webstate.nightMode != null) && (webstate.nightMode != oldNightMode)) { nightMode = (webstate.nightMode == '1'); if (nightMode) { QC('body').add('night'); QS('body')['background-color'] = '#000'; } else { QC('body').remove('night'); QS('body')['background-color'] = '#d3d9d6'; } }
+ if ((webstate.nightMode != null) && (webstate.nightMode != oldNightMode)) { putstore('nightMode', webstate.nightMode); setNightMode(); }
if ((webstate.footerBar != null) && (webstate.footerBar != oldFooterBar)) { footerBar = (webstate.footerBar == '1'); QS('container')['grid-template-rows'] = null; QS('container')['-ms-grid-rows'] = null; adjustPanels(); }
if ((webstate.stars != null) && (webstate.stars != JSON.stringify(stars))) {
stars = JSON.parse(webstate.stars);
![](\\\"images/android-40.png\\\"){kind=small}