Merge branch '4.0'

This commit is contained in:
Dan Stillman 2016-08-14 17:27:36 -04:00
commit daf0f8e0b0
5 changed files with 203 additions and 233 deletions

View file

@ -319,9 +319,6 @@ function makeZoteroContext(isConnector) {
subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/standalone.js", zContext);
}
// load nsTransferable (query: do we still use this?)
subscriptLoader.loadSubScript("chrome://global/content/nsTransferable.js", zContext);
// add connector-related properties
zContext.Zotero.isConnector = isConnector;
zContext.Zotero.instanceID = instanceID;