ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Spacing, use const and let instead of var

pull/3621/head
Isaac Connor 2022-10-21 18:10:59 -04:00
parent 2e03d91ef7
commit f0cd36989b
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
web/js/logger.js
View File

@ -19,7 +19,7 @@
$j.ajaxSetup({timeout: AJAX_TIMEOUT}); $j.ajaxSetup({timeout: AJAX_TIMEOUT});
const reportLogs = (typeof(ZM_LOG_INJECT) !== 'undefined') && ((ZM_LOG_INJECT !== '0') || canEdit["System"]); const reportLogs = (typeof(ZM_LOG_INJECT) !== 'undefined') && ((ZM_LOG_INJECT !== '0') || canEdit["System"]);
if ( !window.console ) { if (!window.console) {
window.console = window.console =
{ {
init: function() {}, init: function() {},
@ -29,9 +29,7 @@ if ( !window.console ) {
warn: function() {}, warn: function() {},
error: function() {} error: function() {}
}; };
} } else if (!console.debug) {
if ( !console.debug ) {
// IE8 has console but doesn't have console.debug so lets alias it. // IE8 has console but doesn't have console.debug so lets alias it.
console.debug = console.log; console.debug = console.log;
} }
@ -41,22 +39,22 @@ window.onerror = function(message, url, line) {
}; };
window.addEventListener("securitypolicyviolation", function logCSP(evt) { window.addEventListener("securitypolicyviolation", function logCSP(evt) {
var level = evt.disposition == "enforce" ? "ERR" : "DBG"; const level = evt.disposition == "enforce" ? "ERR" : "DBG";
var message = evt.blockedURI + " violated CSP " + evt.violatedDirective; let message = evt.blockedURI + " violated CSP " + evt.violatedDirective;
if ( evt.sample ) message += " (Sample: " + evt.sample + ")"; if ( evt.sample ) message += " (Sample: " + evt.sample + ")";
logReport(level, message, evt.sourceFile, evt.lineNumber); logReport(level, message, evt.sourceFile, evt.lineNumber);
}); });
function logReport( level, message, file, line ) { function logReport( level, message, file, line ) {
if ( !reportLogs ) return; if (!reportLogs) return;
/* eslint-disable no-caller */ /* eslint-disable no-caller */
if ( arguments && arguments.callee && arguments.callee.caller && arguments.callee.caller.caller && arguments.callee.caller.caller.name ) { if (arguments && arguments.callee && arguments.callee.caller && arguments.callee.caller.caller && arguments.callee.caller.caller.name) {
message += ' - '+arguments.callee.caller.caller.name+'()'; message += ' - '+arguments.callee.caller.caller.name+'()';
} }
var data = { const data = {
view: 'request', view: 'request',
request: 'log', request: 'log',
task: 'create', task: 'create',
@ -65,14 +63,14 @@ function logReport( level, message, file, line ) {
browser: browserInfo() browser: browserInfo()
}; };
if ( file ) { if (file) {
data.file = file; data.file = file;
} else if ( location.search ) { } else if (location.search) {
//location.search is the querystring part, so ?blah=blah but there is almost never any value to this //location.search is the querystring part, so ?blah=blah but there is almost never any value to this
data.file = location.search; data.file = location.search;
} }
if ( line ) data.line = line; if (line) data.line = line;
$j.post(thisUrl, data, null, 'json'); $j.post(thisUrl, data, null, 'json');
} }
@ -85,8 +83,8 @@ function Panic(message) {
function Fatal(message) { function Fatal(message) {
console.error(message); console.error(message);
logReport( "FAT", message ); logReport("FAT", message);
alert( "FATAL: "+message ); alert("FATAL: "+message);
} }
function Error(message) { function Error(message) {
@ -110,7 +108,7 @@ function Debug(message) {
} }
function Dump(value, label) { function Dump(value, label) {
if ( label ) console.debug(label+" => "); if (label) console.debug(label+" => ");
console.debug(value); console.debug(value);
} }