suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix WPD leak by loading into a local scope

Browse Source
This commit is contained in:
Simon Kornblith 2012-02-05 18:58:15 -05:00
parent 39c86a791e
commit a78cd2cf18
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chrome/content/zotero/xpcom/attachments.js
View File

@ -567,8 +567,17 @@ Zotero.Attachments = new function(){
if (mimeType === 'text/html' || mimeType === 'application/xhtml+xml') { if (mimeType === 'text/html' || mimeType === 'application/xhtml+xml') {
var sync = true; var sync = true;
Zotero.WebPageDump.wpdDOMSaver.init(file.path, document); // Load WebPageDump code
Zotero.WebPageDump.wpdDOMSaver.saveHTMLDocument(); var wpd = {"Zotero":Zotero};
Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader)
.loadSubScript("chrome://zotero/content/webpagedump/common.js", wpd);
Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader)
.loadSubScript("chrome://zotero/content/webpagedump/domsaver.js", wpd);
wpd.wpdDOMSaver.init(file.path, document);
wpd.wpdDOMSaver.saveHTMLDocument();
attachmentItem.attachmentPath = this.getPath( attachmentItem.attachmentPath = this.getPath(
file, Zotero.Attachments.LINK_MODE_IMPORTED_URL file, Zotero.Attachments.LINK_MODE_IMPORTED_URL

9
components/zotero-service.js
View File

@ -206,15 +206,6 @@ function makeZoteroContext(isConnector) {
.getService(Ci.mozIJSSubScriptLoader) .getService(Ci.mozIJSSubScriptLoader)
.loadSubScript("chrome://zotero/content/xpcom/citeproc.js", zContext.Zotero.CiteProc); .loadSubScript("chrome://zotero/content/xpcom/citeproc.js", zContext.Zotero.CiteProc);
// Load WPD into Zotero.WebPageDump namespace
zContext.Zotero.WebPageDump = {"Zotero":zContext.Zotero};
Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader)
.loadSubScript("chrome://zotero/content/webpagedump/common.js", zContext.Zotero.WebPageDump);
Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader)
.loadSubScript("chrome://zotero/content/webpagedump/domsaver.js", zContext.Zotero.WebPageDump);
// Load remaining xpcomFiles // Load remaining xpcomFiles
for (var i=1; i<xpcomFilesAll.length; i++) { for (var i=1; i<xpcomFilesAll.length; i++) {
try { try {