mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update definition style of Zotero.log() and Zotero.logError()

Browse source
This commit is contained in:
Dan Stillman 2022-08-01 04:38:37 -04:00
parent e6256d60ec
commit e82e808f2b
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/xpcom/zotero.js
View file

@ -41,8 +41,6 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
// Privileged (public) methods // Privileged (public) methods
this.getStorageDirectory = getStorageDirectory; this.getStorageDirectory = getStorageDirectory;
this.debug = debug; this.debug = debug;
this.log = log;
this.logError = logError;
this.setFontSize = setFontSize; this.setFontSize = setFontSize;
this.flattenArguments = flattenArguments; this.flattenArguments = flattenArguments;
this.getAncestorByTagName = getAncestorByTagName; this.getAncestorByTagName = getAncestorByTagName;
@ -1168,7 +1166,7 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
* |type| is a string with one of the flag types in nsIScriptError: * |type| is a string with one of the flag types in nsIScriptError:
* 'error', 'warning', 'exception', 'strict' * 'error', 'warning', 'exception', 'strict'
*/ */
function log(message, type, sourceName, sourceLine, lineNumber, columnNumber) { this.log = function (message, type, sourceName, sourceLine, lineNumber, columnNumber) {
var scriptError = Components.classes["@mozilla.org/scripterror;1"] var scriptError = Components.classes["@mozilla.org/scripterror;1"]
.createInstance(Components.interfaces.nsIScriptError); .createInstance(Components.interfaces.nsIScriptError);
@ -1189,15 +1187,15 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
true true
); );
Services.console.logMessage(scriptError); Services.console.logMessage(scriptError);
} };
/** /**
* Log a JS error to the Mozilla error console and debug output * Log a JS error to the Mozilla error console and debug output
* @param {Exception} err * @param {Exception} err
*/ */
function logError(err) { this.logError = function (err) {
Zotero.debug(err, 1); Zotero.debug(err, 1);
log(err.message ? err.message : err.toString(), "error", this.log(err.message ? err.message : err.toString(), "error",
err.fileName ? err.fileName : (err.filename ? err.filename : null), null, err.fileName ? err.fileName : (err.filename ? err.filename : null), null,
err.lineNumber ? err.lineNumber : null, null); err.lineNumber ? err.lineNumber : null, null);
} }
@ -1205,7 +1203,7 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
this.warn = function (err) { this.warn = function (err) {
Zotero.debug(err + "\n\n" + Zotero.Utilities.Internal.filterStack(new Error().stack), 2); Zotero.debug(err + "\n\n" + Zotero.Utilities.Internal.filterStack(new Error().stack), 2);
log(err.message ? err.message : err.toString(), "warning", this.log(err.message ? err.message : err.toString(), "warning",
err.fileName ? err.fileName : (err.filename ? err.filename : null), null, err.fileName ? err.fileName : (err.filename ? err.filename : null), null,
err.lineNumber ? err.lineNumber : null, null); err.lineNumber ? err.lineNumber : null, null);
} }