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

commit Rintze's changes to translate.js for Scaffold compatibility

Browse source
This commit is contained in:
Simon Kornblith 2010-06-06 03:11:24 +00:00
parent 546641aa44
commit d0441d334e
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
chrome/content/zotero/xpcom/translate.js
View file

@ -179,8 +179,15 @@ Zotero.Translators = new function() {
var destFile = Zotero.getTranslatorsDirectory();
destFile.append(fileName);
var nsIJSON = Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON);
var metadataJSON = nsIJSON.encode(metadata);
var metadataJSON;
// JSON.stringify (FF 3.5.4 and up) has the benefit of indenting JSON
if (typeof JSON != "undefined" && 'function' == typeof JSON.stringify) {
metadataJSON = JSON.stringify(metadata,null,8);
} else {
var nsIJSON = Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON);
metadataJSON = nsIJSON.encode(metadata);
}
var str = metadataJSON + "\n\n" + code;
@ -813,7 +820,11 @@ Zotero.Translate.prototype._parseCode = function(translator) {
Components.utils.evalInSandbox("var translatorInfo = "+translator.code, this._sandbox);
return true;
} catch(e) {
translator.logError(e.toString());
if('function' == typeof translator.logError) {
translator.logError(e.toString());
} else {
Components.utils.reportError(e);
}
this._debug(e+' in parsing code for '+translator.label, 3);
return false;
}
@ -1102,7 +1113,7 @@ Zotero.Translate.prototype._translationComplete = function(returnValue, error) {
if(!returnValue) {
// report error to console
if(this.translator[0]) {
if(typeof this.translator[0] != "undefined" && 'function' == typeof this.translator[0].logError) {
this.translator[0].logError(error.toString(), "exception");
} else {
Components.utils.reportError(error);