mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix http://forums.zotero.org/discussion/23702/chrome-connector-hangs-on-some-pages-when-invoked-from-the-save-zotero-snapshot-context-menu/

Browse source
This commit is contained in:
Simon Kornblith 2012-11-11 17:14:19 -05:00
parent 425b2161cc
commit a4f4691b04
1 changed files with 42 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

96
chrome/content/zotero/xpcom/server_connector.js
View file

@ -341,63 +341,51 @@ Zotero.Server.Connector.SaveSnapshot.prototype = {
*/ */
"init":function(url, data, sendResponseCallback) { "init":function(url, data, sendResponseCallback) {
Zotero.Server.Connector.Data[data["url"]] = "<html>"+data["html"]+"</html>"; Zotero.Server.Connector.Data[data["url"]] = "<html>"+data["html"]+"</html>";
var browser = Zotero.Browser.createHiddenBrowser(); Zotero.HTTP.processDocuments(["zotero://connector/"+encodeURIComponent(data["url"])],
function(doc) {
var pageShowCalled = false; delete Zotero.Server.Connector.Data[data["url"]];
var cookieSandbox = new Zotero.CookieSandbox(browser, data["url"], data["cookie"], url.userAgent);
browser.addEventListener("pageshow", function() {
if(browser.contentDocument.location.href == "about:blank"
|| browser.contentDocument.readyState !== "complete") return;
if(pageShowCalled) return;
pageShowCalled = true;
delete Zotero.Server.Connector.Data[data["url"]];
// figure out where to save
var libraryID = null;
var collectionID = null;
var zp = Zotero.getActiveZoteroPane();
try {
var libraryID = zp.getSelectedLibraryID();
var collection = zp.getSelectedCollection();
} catch(e) {}
try {
var doc = browser.contentDocument;
// create new webpage item // figure out where to save
var item = new Zotero.Item("webpage"); var libraryID = null;
item.libraryID = libraryID; var collectionID = null;
item.setField("title", doc.title); var zp = Zotero.getActiveZoteroPane();
item.setField("url", data.url); try {
item.setField("accessDate", "CURRENT_TIMESTAMP"); var libraryID = zp.getSelectedLibraryID();
var itemID = item.save(); var collection = zp.getSelectedCollection();
if(collection) collection.addItem(itemID); } catch(e) {}
// determine whether snapshot can be saved try {
var filesEditable; // create new webpage item
if (libraryID) { var item = new Zotero.Item("webpage");
var group = Zotero.Groups.getByLibraryID(libraryID); item.libraryID = libraryID;
filesEditable = group.filesEditable; item.setField("title", doc.title);
} else { item.setField("url", data.url);
filesEditable = true; item.setField("accessDate", "CURRENT_TIMESTAMP");
var itemID = item.save();
if(collection) collection.addItem(itemID);
// determine whether snapshot can be saved
var filesEditable;
if (libraryID) {
var group = Zotero.Groups.getByLibraryID(libraryID);
filesEditable = group.filesEditable;
} else {
filesEditable = true;
}
// save snapshot
if(filesEditable) {
Zotero.Attachments.importFromDocument(doc, itemID);
}
sendResponseCallback(201);
} catch(e) {
sendResponseCallback(500);
throw e;
} }
},
// save snapshot null, null, false,
if(filesEditable) { new Zotero.CookieSandbox(null, data["url"], data["cookie"], url.userAgent));
Zotero.Attachments.importFromDocument(doc, itemID);
}
// remove browser
Zotero.Browser.deleteHiddenBrowser(browser);
sendResponseCallback(201);
} catch(e) {
sendResponseCallback(500);
throw e;
}
}, false);
browser.loadURI("zotero://connector/"+encodeURIComponent(data["url"]));
} }
} }