www

commit 62180e0cd23a9d15abc030f664dbf68be28da671
parent 0741bb396f1cd9f70fb9a62b8e2761a4e26bd5c7
Author: Simon Kornblith <simon@simonster.com>
Date:   Tue,  4 Oct 2011 03:14:08 +0000

Remove obsolete nsIJSON uses


Diffstat:
M
chrome/content/zotero/xpcom/schema.js
 | 
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
@@ -628,10 +628,8 @@ Zotero.Schema = new function(){
 				var dbCache = Zotero.DB.columnQuery(sql);
 				// If there's anything in the cache, see what we actually need to extract
 				if (dbCache) {
-					var nsIJSON = Components.classes["@mozilla.org/dom/json;1"]
-						.createInstance(Components.interfaces.nsIJSON);
 					for each(var json in dbCache) {
-						var metadata = nsIJSON.decode(json);
+						var metadata = JSON.parse(json);
 						var id = metadata.translatorID;
 						if (index[id] && index[id].lastUpdated == metadata.lastUpdated) {
 							index[id].extract = false;
@@ -2546,8 +2544,7 @@ Zotero.Schema = new function(){
 							var fileName = Zotero.Translators.getFileNameFromLabel(row.label);
 							file.append(fileName);
 							var metadata = { translatorID: row.translatorID, translatorType: parseInt(row.translatorType), label: row.label, creator: row.creator, target: row.target ? row.target : null, minVersion: row.minVersion, maxVersion: row.maxVersion, priority: parseInt(row.priority), inRepository: row.inRepository == 1 ? true : false, lastUpdated: row.lastUpdated };
-							var nsIJSON = Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON);
-							var metadataJSON = nsIJSON.encode(metadata);
+							var metadataJSON = JSON.stringify(metadata, null, "\t");
 							var str = metadataJSON + "\n\n" + (row.detectCode ? row.detectCode + "\n\n" : "") + row.code;
 							Zotero.debug("Extracting translator '" + row.label + "' from database");
 							Zotero.File.putContents(file, str);