Merge branch '3.0'

This commit is contained in:
Dan Stillman 2012-02-09 02:18:15 -05:00
commit 6c5e155ba7
4 changed files with 96 additions and 1 deletions

View file

@ -255,6 +255,13 @@ function makeZoteroContext(isConnector) {
.loadSubScript("chrome://zotero/content/xpcom/" + rdfXpcomFiles[i] + ".js", zContext.Zotero.RDF.AJAW);
}
if(isStandalone()) {
// If isStandalone, load standalone.js
Cc["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Ci.mozIJSSubScriptLoader)
.loadSubScript("chrome://zotero/content/xpcom/standalone.js", zContext);
}
// load nsTransferable (query: do we still use this?)
Cc["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Ci.mozIJSSubScriptLoader)