www

commit 5894a9511dcb934191050552810481aa3ed2b3aa
parent fb521ea4adacef59a7c6ba1242a515fef7683318
Author: Simon Kornblith <simon@simonster.com>
Date:   Sat,  5 May 2012 16:53:00 -0400

Tweak RDF loading code

Diffstat:
M
chrome/content/zotero/xpcom/rdf/init.js
 | 
6
+++---
M
components/zotero-service.js
 | 
4
++--

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/xpcom/rdf/init.js b/chrome/content/zotero/xpcom/rdf/init.js
@@ -29,8 +29,8 @@ var $rdf = {
 	alert: Zotero.debug
 };
 
-if(!Zotero.RDF) {	// For connector
+if(Zotero.RDF) {
+	Zotero.RDF.AJAW = $rdf;
+} else {
 	Zotero.RDF = {AJAW:$rdf};
-} else {			// For extension
-	Zotero.RDF.AJAW.$rdf = $rdf;
 }
 \ No newline at end of file
diff --git a/components/zotero-service.js b/components/zotero-service.js
@@ -243,11 +243,11 @@ function makeZoteroContext(isConnector) {
 		'rdf/rdfparser',
 		'rdf/serialize'
 	];
-	zContext.Zotero.RDF = {AJAW:{Zotero:zContext.Zotero}};
+	zContext.Zotero.RDF = {Zotero:zContext.Zotero};
 	for (var i=0; i<rdfXpcomFiles.length; i++) {
 		Cc["@mozilla.org/moz/jssubscript-loader;1"]
 			.getService(Ci.mozIJSSubScriptLoader)
-			.loadSubScript("chrome://zotero/content/xpcom/" + rdfXpcomFiles[i] + ".js", zContext.Zotero.RDF.AJAW);
+			.loadSubScript("chrome://zotero/content/xpcom/" + rdfXpcomFiles[i] + ".js", zContext.Zotero.RDF);
 	}
 	
 	if(isStandalone()) {