Skip to content
Snippets Groups Projects
Commit 719175ea authored by Michael Long's avatar Michael Long
Browse files

fix screen flash, ftelnet size is still a concern

parent 72f2d281
No related branches found
No related tags found
2 merge requests!463MRC mods by Codefenix (2024-10-20),!68dark mode for webv4
Hide whitespace changes
Inline Side-by-side
webv4/root/index.xjs
+ 7
− 1
View file @ 719175ea
......@@ -41,6 +41,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<style type="text/css">
.hidden { display:none; }
</style>
<script src="./js/jquery.min.js"></script>
<script type="text/javascript">
jQuery('html').addClass('hidden');
</script>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
......@@ -57,7 +64,6 @@
<body>
<script src="./js/jquery.min.js"></script>
<script src="./bootstrap/js/bootstrap.min.js"></script>
<script src="./js/common.js"></script>
......
webv4/root/js/common.js
+ 58
− 55
View file @ 719175ea
......@@ -62,21 +62,21 @@ function scrollUp() {
}
function sendTelegram(alias) {
function send_tg(evt) {
if (typeof evt !== 'undefined') evt.preventDefault();
function send_tg(evt) {
if (typeof evt !== 'undefined') evt.preventDefault();
v4_post('./api/system.ssjs', { call: 'send-telegram', user: alias, telegram: $('#telegram').val() });
$('#popUpModal').modal('hide');
}
$('#popUpModal').modal('hide');
}
$('#popUpModalTitle').html('Send a telegram to ' + alias);
$('#popUpModalBody').html(
'<form id="send-telegram-form">'
'<form id="send-telegram-form">'
+ '<input type="text" class="form-control" placeholder="My message" name="telegram" id="telegram">'
+ '<input type="submit" value="submit" class="hidden">'
+ '</form>'
+ '<input type="submit" value="submit" class="hidden">'
+ '</form>'
);
$('#send-telegram-form').submit(send_tg);
$('#send-telegram-form').submit(send_tg);
$('#popUpModalActionButton').click(send_tg);
$('#popUpModalActionButton').show();
$('#popUpModalActionButton').show();
$('#popUpModal').modal('show');
}
......@@ -91,8 +91,40 @@ function registerEventListener(scope, callback, params) {
};
}
window.onload = function () {
document.addEventListener("DOMContentLoaded", function(){
// originally based on dark-mode-switch by Christian Oliff
var darkSwitch = document.getElementById("darkSwitch");
if (darkSwitch) {
initTheme();
darkSwitch.addEventListener("change", function(event) {
resetTheme();
});
function initTheme() {
var darkThemeSelected =
localStorage.getItem("darkSwitch") !== null &&
localStorage.getItem("darkSwitch") === "dark";
darkSwitch.checked = darkThemeSelected;
if (darkThemeSelected) {
jQuery("body").addClass("dark")
} else {
jQuery("body").removeClass("dark");
}
}
function resetTheme() {
if (darkSwitch.checked) {
jQuery("body").addClass("dark");
localStorage.setItem("darkSwitch", "dark");
} else {
jQuery("body").removeClass("dark");
localStorage.removeItem("darkSwitch");
}
}
}
jQuery('html').removeClass('hidden');
});
window.onload = function () {
$('#button-logout').click(logout);
$('#button-login').click(login);
$('#form-login').submit(login);
......@@ -112,20 +144,20 @@ window.onload = function () {
if ($('#button-logout').length > 0) {
registerEventListener('mail', function (e) {
const data = JSON.parse(e.data);
if (typeof data.count != 'number') return;
$('#badge-unread-mail').text(data.count < 1 ? '' : data.count);
$('#badge-unread-mail-inner').text(data.count < 1 ? '' : data.count);
const data = JSON.parse(e.data);
if (typeof data.count != 'number') return;
$('#badge-unread-mail').text(data.count < 1 ? '' : data.count);
$('#badge-unread-mail-inner').text(data.count < 1 ? '' : data.count);
});
registerEventListener('telegram', function (e) {
const tg = JSON.parse(e.data).replace(/\1./g, '').replace(
/\r?\n/g, '<br>'
);
$('#popUpModalTitle').html('New telegram(s) received');
$('#popUpModalBody').append(tg);
$('#popUpModalActionButton').hide();
$('#popUpModal').modal('show');
const tg = JSON.parse(e.data).replace(/\1./g, '').replace(
/\r?\n/g, '<br>'
);
$('#popUpModalTitle').html('New telegram(s) received');
$('#popUpModalBody').append(tg);
$('#popUpModalActionButton').hide();
$('#popUpModal').modal('show');
});
}
......@@ -134,37 +166,8 @@ window.onload = function () {
return a + (i == 0 ? '?' : '&') + _sbbs_events[c].qs;
}, '');
const es = new EventSource('/api/events.ssjs' + qs);
Object.keys(_sbbs_events).forEach(function (e) {
es.addEventListener(e, _sbbs_events[e].callback);
});
// originally based on dark-mode-switch by Christian Oliff
var darkSwitch = document.getElementById("darkSwitch");
if (darkSwitch) {
initTheme();
darkSwitch.addEventListener("change", function(event) {
resetTheme();
});
function initTheme() {
var darkThemeSelected =
localStorage.getItem("darkSwitch") !== null &&
localStorage.getItem("darkSwitch") === "dark";
darkSwitch.checked = darkThemeSelected;
if (darkThemeSelected) {
jQuery("body").addClass("dark")
} else {
jQuery("body").removeClass("dark");
}
}
function resetTheme() {
if (darkSwitch.checked) {
jQuery("body").addClass("dark");
localStorage.setItem("darkSwitch", "dark");
} else {
jQuery("body").removeClass("dark");
localStorage.removeItem("darkSwitch");
}
}
}
const es = new EventSource('/api/events.ssjs' + qs);
Object.keys(_sbbs_events).forEach(function (e) {
es.addEventListener(e, _sbbs_events[e].callback);
});
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment