Merge branch '4.0' into api_syncing
This commit is contained in:
commit
fec43f1f62
157 changed files with 1539 additions and 686 deletions
|
@ -340,8 +340,10 @@ function ZoteroService() {
|
|||
}
|
||||
this.wrappedJSObject = zContext.Zotero;
|
||||
} catch(e) {
|
||||
var msg = typeof e == 'string' ? e : e.name;
|
||||
dump(e + "\n\n");
|
||||
var msg = e instanceof Error
|
||||
? e.name + ': ' + e.message + '\n' + e.fileName + ':' + e.lineNumber + '\n' + e.stack
|
||||
: '' + e;
|
||||
dump(msg + '\n');
|
||||
Components.utils.reportError(e);
|
||||
throw e;
|
||||
}
|
||||
|
@ -376,7 +378,7 @@ ZoteroCommandLineHandler.prototype = {
|
|||
/* nsICommandLineHandler */
|
||||
handle : function(cmdLine) {
|
||||
// Force debug output
|
||||
if (cmdLine.handleFlag("zoterodebug", false)) {
|
||||
if (cmdLine.handleFlag("ZoteroDebug", false)) {
|
||||
zInitOptions.forceDebugLog = true;
|
||||
}
|
||||
|
||||
|
@ -459,6 +461,10 @@ ZoteroCommandLineHandler.prototype = {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (cmdLine.handleFlag("ZoteroNoUserInput", false)) {
|
||||
zInitOptions.noUserInput = true;
|
||||
}
|
||||
},
|
||||
|
||||
contractID: "@mozilla.org/commandlinehandler/general-startup;1?type=zotero",
|
||||
|
@ -483,4 +489,4 @@ if (XPCOMUtils.generateNSGetFactory) {
|
|||
var NSGetFactory = XPCOMUtils.generateNSGetFactory([ZoteroService, ZoteroCommandLineHandler]);
|
||||
} else {
|
||||
var NSGetModule = XPCOMUtils.generateNSGetModule([ZoteroService, ZoteroCommandLineHandler]);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue