fix minify files and log minify errors

Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
si458 2025-02-25 17:21:50 +00:00
parent 38f5bf2e0f
commit 91bd5ae702
6 changed files with 20 additions and 984 deletions

File diff suppressed because one or more lines are too long

View File

@ -155,7 +155,6 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
if (Msg[1] == 1) { obj.ProcessCopyRectMsg(Msg[2]); } if (Msg[1] == 1) { obj.ProcessCopyRectMsg(Msg[2]); }
else if (Msg[1] == 2) { obj.Canvas.drawImage(Msg[2], obj.rotX(Msg[3], Msg[4]), obj.rotY(Msg[3], Msg[4])); delete Msg[2]; } else if (Msg[1] == 2) { obj.Canvas.drawImage(Msg[2], obj.rotX(Msg[3], Msg[4]), obj.rotY(Msg[3], Msg[4])); delete Msg[2]; }
obj.PendingOperations.splice(i, 1); obj.PendingOperations.splice(i, 1);
delete Msg;
obj.TilesDrawn++; obj.TilesDrawn++;
if ((obj.TilesDrawn == obj.tilesReceived) && (obj.KillDraw < obj.TilesDrawn)) { obj.KillDraw = obj.TilesDrawn = obj.tilesReceived = 0; } if ((obj.TilesDrawn == obj.tilesReceived) && (obj.KillDraw < obj.TilesDrawn)) { obj.KillDraw = obj.TilesDrawn = obj.tilesReceived = 0; }
return true; return true;

View File

@ -64,6 +64,7 @@ var minifyMeshCentralSourceFiles = [
"../views/agentinvite.handlebars", "../views/agentinvite.handlebars",
"../views/invite.handlebars", "../views/invite.handlebars",
"../views/default.handlebars", "../views/default.handlebars",
"../views/default3.handlebars",
"../views/default-mobile.handlebars", "../views/default-mobile.handlebars",
"../views/download.handlebars", "../views/download.handlebars",
"../views/download2.handlebars", "../views/download2.handlebars",
@ -452,7 +453,8 @@ function startEx(argv) {
removeScriptTypeAttributes: true, removeScriptTypeAttributes: true,
removeTagWhitespace: true, removeTagWhitespace: true,
preserveLineBreaks: false, preserveLineBreaks: false,
useShortDoctype: true useShortDoctype: true,
log: function(a) { if (typeof a !== 'string') { console.log(a); } } // Log errors from UglifyJS to console output
}); });
} catch (ex) { } catch (ex) {
console.log(ex); console.log(ex);

View File

@ -1325,7 +1325,7 @@
var logoutControls = JSON.parse(decodeURIComponent('{{{logoutControls}}}')); var logoutControls = JSON.parse(decodeURIComponent('{{{logoutControls}}}'));
var authCookieRenewTimer = null; var authCookieRenewTimer = null;
var webRelayPort = parseInt('{{{webRelayPort}}}'); var webRelayPort = parseInt('{{{webRelayPort}}}');
var hidePowerTimeline = {{{hidePowerTimeline}}}; var hidePowerTimeline = '{{{hidePowerTimeline}}}';
var webRelayDns = '{{{webRelayDns}}}'; var webRelayDns = '{{{webRelayDns}}}';
var meshserver = null; var meshserver = null;
var xdr = null; var xdr = null;
@ -4267,7 +4267,7 @@
// Draw device power bars. The bars are 766px wide. // Draw device power bars. The bars are 766px wide.
function drawDeviceTimeline() { function drawDeviceTimeline() {
if (currentNode.mtype == 3 || hidePowerTimeline) { QH('p10html2', '<br />'); return; } if (currentNode.mtype == 3 || hidePowerTimeline === 'true') { QH('p10html2', '<br />'); return; }
var timeline = null, now = Date.now(); var timeline = null, now = Date.now();
if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; } if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; }

View File

@ -1553,8 +1553,8 @@
var sessionTime = parseInt('{{{sessiontime}}}'); var sessionTime = parseInt('{{{sessiontime}}}');
var webRelayPort = parseInt('{{{webRelayPort}}}'); var webRelayPort = parseInt('{{{webRelayPort}}}');
var webRelayDns = '{{{webRelayDns}}}'; var webRelayDns = '{{{webRelayDns}}}';
var hidePowerTimeline = {{{hidePowerTimeline}}}; var hidePowerTimeline = '{{{hidePowerTimeline}}}';
var showNotesPanel = {{{showNotesPanel}}}; var showNotesPanel = '{{{showNotesPanel}}}';
var sessionRefreshTimer = null; var sessionRefreshTimer = null;
var domain = '{{{domain}}}'; var domain = '{{{domain}}}';
var domainUrl = '{{{domainurl}}}'; var domainUrl = '{{{domainurl}}}';
@ -3027,7 +3027,7 @@
} }
}else{ }else{
Q('notesPanelArea').innerHTML = (message.notes && marked && DOMPurify) ? DOMPurify.sanitize(marked.parse(decodeURIComponent(message.notes), { breaks: true }), { USE_PROFILES: { html: true } }) : ''; Q('notesPanelArea').innerHTML = (message.notes && marked && DOMPurify) ? DOMPurify.sanitize(marked.parse(decodeURIComponent(message.notes), { breaks: true }), { USE_PROFILES: { html: true } }) : '';
if (showNotesPanel && message.notes) { QV('notesPanel',true); }else{ QV('notesPanel', false); } if ((showNotesPanel === 'true') && message.notes) { QV('notesPanel',true); }else{ QV('notesPanel', false); }
} }
break; break;
} }
@ -8243,7 +8243,7 @@
if (noteid == null) { noteid = encodeURIComponentEx('p'+userinfo._id); } if (noteid == null) { noteid = encodeURIComponentEx('p'+userinfo._id); }
var x = '<textarea id=d2devNotes ro=' + readonly + ' noteid=' + noteid + ' readonly style=background-color:#fcf3cf;width:100%;height:200px;resize:none;overflow-y:scroll></textarea>'; var x = '<textarea id=d2devNotes ro=' + readonly + ' noteid=' + noteid + ' readonly style=background-color:#fcf3cf;width:100%;height:200px;resize:none;overflow-y:scroll></textarea>';
if (noteid.startsWith('node%2F%2F')) { x += ' <span style=font-size:10px>' + "Device group notes can be viewed and changed by other device group administrators." + '</span>'; } if (noteid.startsWith('node%2F%2F')) { x += ' <span style=font-size:10px>' + "Device group notes can be viewed and changed by other device group administrators." + '</span>'; }
if (showNotesPanel) { x += ' <span style=font-size:10px><a target=_blank href=\'https://www.markdownguide.org/cheat-sheet/\'>' + "Markdown syntax supported" + '</a></span>'; } if (showNotesPanel === 'true') { x += ' <span style=font-size:10px><a target=_blank href=\'https://www.markdownguide.org/cheat-sheet/\'>' + "Markdown syntax supported" + '</a></span>'; }
setDialogMode(2, "Notes", 3, showNotesEx, x, noteid); setDialogMode(2, "Notes", 3, showNotesEx, x, noteid);
meshserver.send({ action: 'getNotes', id: decodeURIComponent(noteid) }); meshserver.send({ action: 'getNotes', id: decodeURIComponent(noteid) });
} }
@ -8251,7 +8251,7 @@
function showNotesEx(buttons, tag) { function showNotesEx(buttons, tag) {
Q('notesPanelArea').innerHTML = (marked && DOMPurify) ? DOMPurify.sanitize(marked.parse(Q('d2devNotes').value, { breaks: true }), { USE_PROFILES: { html: true } }) : Q('d2devNotes').value; Q('notesPanelArea').innerHTML = (marked && DOMPurify) ? DOMPurify.sanitize(marked.parse(Q('d2devNotes').value, { breaks: true }), { USE_PROFILES: { html: true } }) : Q('d2devNotes').value;
meshserver.send({ action: 'setNotes', id: decodeURIComponent(tag), notes: encodeURIComponentEx(Q('d2devNotes').value) }); meshserver.send({ action: 'setNotes', id: decodeURIComponent(tag), notes: encodeURIComponentEx(Q('d2devNotes').value) });
if (showNotesPanel && Q('d2devNotes').value != '') { QV('notesPanel',true); }else{ QV('notesPanel', false); } if ((showNotesPanel === 'true') && Q('d2devNotes').value != '') { QV('notesPanel',true); }else{ QV('notesPanel', false); }
} }
function openIpKvmRemoteControl(nodeid) { function openIpKvmRemoteControl(nodeid) {
@ -8672,7 +8672,7 @@
// Draw device power bars. The bars are 766px wide. // Draw device power bars. The bars are 766px wide.
function drawDeviceTimeline() { function drawDeviceTimeline() {
if ((currentNode == null) || (xxcurrentView < 10) || (xxcurrentView > 19) || (currentNode.mtype == 3) || (hidePowerTimeline)) return; if ((currentNode == null) || (xxcurrentView < 10) || (xxcurrentView > 19) || (currentNode.mtype == 3) || (hidePowerTimeline === 'true')) return;
var timeline = null, now = Date.now(); var timeline = null, now = Date.now();
if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; } if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; }

View File

@ -1540,7 +1540,7 @@
<div class="areaHead d-flex align-items-center flex-wrap p-1"> <div class="areaHead d-flex align-items-center flex-wrap p-1">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<input value="Refresh" type="button" class="btn btn-primary btn-sm me-2" onclick="refreshServerTimelineStats()" /> <input value="Refresh" type="button" class="btn btn-primary btn-sm me-2" onclick="refreshServerTimelineStats()" />
<div class="form-check"><input class="form-check-input me-1" type=checkbox id=p40log onclick="updateServerTimelineHours()" / /><label class="form-check-label" for="p40log">Log-X</label></div> <div class="form-check"><input class="form-check-input me-1" type=checkbox id=p40log onclick="updateServerTimelineHours()" /><label class="form-check-label" for="p40log">Log-X</label></div>
</div> </div>
<div class="toright2 d-flex align-items-center ms-auto"> <div class="toright2 d-flex align-items-center ms-auto">
<select id=p40server style="display:none" onchange=updateServerTimelineStats()></select> <select id=p40server style="display:none" onchange=updateServerTimelineStats()></select>
@ -1980,8 +1980,8 @@
var sessionTime = parseInt('{{{sessiontime}}}'); var sessionTime = parseInt('{{{sessiontime}}}');
var webRelayPort = parseInt('{{{webRelayPort}}}'); var webRelayPort = parseInt('{{{webRelayPort}}}');
var webRelayDns = '{{{webRelayDns}}}'; var webRelayDns = '{{{webRelayDns}}}';
var hidePowerTimeline = {{{ hidePowerTimeline }}}; var hidePowerTimeline = '{{{hidePowerTimeline}}}';
var showNotesPanel = {{{ showNotesPanel }}}; var showNotesPanel = '{{{showNotesPanel}}}';
var sessionRefreshTimer = null; var sessionRefreshTimer = null;
var domain = '{{{domain}}}'; var domain = '{{{domain}}}';
var domainUrl = '{{{domainurl}}}'; var domainUrl = '{{{domainurl}}}';
@ -2010,7 +2010,7 @@
var footerBar = (getstore('footerBar', '1') == '1'); var footerBar = (getstore('footerBar', '1') == '1');
var sessionActivity = Date.now(); var sessionActivity = Date.now();
var updateSessionTimer = null; var updateSessionTimer = null;
var pluginHandlerBuilder = {{{ pluginHandler }}}; var pluginHandlerBuilder = {{{pluginHandler}}};
var pluginHandler = null; var pluginHandler = null;
if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); } if (pluginHandlerBuilder != null) { pluginHandler = new pluginHandlerBuilder(); }
var installedPluginList = null; var installedPluginList = null;
@ -3482,7 +3482,7 @@
} }
} else { } else {
Q('notesPanelArea').innerHTML = (message.notes && marked && DOMPurify) ? DOMPurify.sanitize(marked.parse(decodeURIComponent(message.notes), { breaks: true }), { USE_PROFILES: { html: true } }) : ''; Q('notesPanelArea').innerHTML = (message.notes && marked && DOMPurify) ? DOMPurify.sanitize(marked.parse(decodeURIComponent(message.notes), { breaks: true }), { USE_PROFILES: { html: true } }) : '';
if (showNotesPanel && message.notes) { QV('notesPanel', true); } else { QV('notesPanel', false); } if ((showNotesPanel === 'true') && message.notes) { QV('notesPanel', true); } else { QV('notesPanel', false); }
} }
break; break;
} }
@ -8919,7 +8919,7 @@
if (noteid == null) { noteid = encodeURIComponentEx('p' + userinfo._id); } if (noteid == null) { noteid = encodeURIComponentEx('p' + userinfo._id); }
var x = '<textarea id=d2devNotes ro=' + readonly + ' noteid=' + noteid + ' readonly class="form-control" style=width:100%;height:200px;resize:none;overflow-y:scroll></textarea>'; var x = '<textarea id=d2devNotes ro=' + readonly + ' noteid=' + noteid + ' readonly class="form-control" style=width:100%;height:200px;resize:none;overflow-y:scroll></textarea>';
if (noteid.startsWith('node%2F%2F')) { x += '<span style=font-size:10px>' + "Device group notes can be viewed and changed by other device group administrators." + '<span>'; } if (noteid.startsWith('node%2F%2F')) { x += '<span style=font-size:10px>' + "Device group notes can be viewed and changed by other device group administrators." + '<span>'; }
if (showNotesPanel) { x += ' <span style=font-size:10px><a target=_blank href=\'https://www.markdownguide.org/cheat-sheet/\'>' + "Markdown syntax supported" + '</a></span>'; } if (showNotesPanel === 'true') { x += ' <span style=font-size:10px><a target=_blank href=\'https://www.markdownguide.org/cheat-sheet/\'>' + "Markdown syntax supported" + '</a></span>'; }
setModalContent('xxAddAgent', "Notes", x); setModalContent('xxAddAgent', "Notes", x);
showModal('xxAddAgentModal', 'idx_dlgOkButton', function () { showModal('xxAddAgentModal', 'idx_dlgOkButton', function () {
showNotesEx(2, noteid); showNotesEx(2, noteid);
@ -8931,7 +8931,7 @@
function showNotesEx(buttons, tag) { function showNotesEx(buttons, tag) {
Q('notesPanelArea').innerHTML = (marked && DOMPurify) ? DOMPurify.sanitize(marked.parse(Q('d2devNotes').value, { breaks: true }), { USE_PROFILES: { html: true } }) : Q('d2devNotes').value; Q('notesPanelArea').innerHTML = (marked && DOMPurify) ? DOMPurify.sanitize(marked.parse(Q('d2devNotes').value, { breaks: true }), { USE_PROFILES: { html: true } }) : Q('d2devNotes').value;
meshserver.send({ action: 'setNotes', id: decodeURIComponent(tag), notes: encodeURIComponentEx(Q('d2devNotes').value) }); meshserver.send({ action: 'setNotes', id: decodeURIComponent(tag), notes: encodeURIComponentEx(Q('d2devNotes').value) });
if (showNotesPanel && Q('d2devNotes').value != '') { QV('notesPanel', true); } else { QV('notesPanel', false); } if ((showNotesPanel === 'true') && Q('d2devNotes').value != '') { QV('notesPanel', true); } else { QV('notesPanel', false); }
} }
function openIpKvmRemoteControl(nodeid) { function openIpKvmRemoteControl(nodeid) {
@ -9376,7 +9376,7 @@
// Draw device power bars. The bars are 766px wide. // Draw device power bars. The bars are 766px wide.
function drawDeviceTimeline() { function drawDeviceTimeline() {
if ((currentNode == null) || (xxcurrentView < 10) || (xxcurrentView > 19) || (currentNode.mtype == 3) || (hidePowerTimeline)) return; if ((currentNode == null) || (xxcurrentView < 10) || (xxcurrentView > 19) || (currentNode.mtype == 3) || (hidePowerTimeline === 'true')) return;
var timeline = null, now = Date.now(); var timeline = null, now = Date.now();
if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; } if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; }