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

Merge branch '3.0'

Browse source
This commit is contained in:
Simon Kornblith 2012-11-11 17:15:30 -05:00
commit bd367dcd85
5 changed files with 924 additions and 550 deletions
Download patch file Download diff file Expand all files Collapse all files

1362
chrome/content/zotero/xpcom/citeproc.js
View file

File diff suppressed because it is too large Load diff

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

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

12
chrome/content/zotero/xpcom/translation/translate_item.js
View file

@ -334,11 +334,13 @@ Zotero.Translate.ItemSaver.prototype = {
Zotero.debug("Translate: Not adding attachment: no URL specified", 2); Zotero.debug("Translate: Not adding attachment: no URL specified", 2);
} else { } else {
// Determine whether to save an attachment // Determine whether to save an attachment
if(attachment.document if(attachment.snapshot !== false) {
|| (attachment.mimeType && attachment.mimeType == "text/html")) { if(attachment.document
if(!Zotero.Prefs.get("automaticSnapshots")) return; || (attachment.mimeType && attachment.mimeType == "text/html")) {
} else { if(!Zotero.Prefs.get("automaticSnapshots")) return;
if(!Zotero.Prefs.get("downloadAssociatedFiles")) return; } else {
if(!Zotero.Prefs.get("downloadAssociatedFiles")) return;
}
} }
if(attachment.document) { if(attachment.document) {

2
components/zotero-protocol-handler.js
View file

@ -963,7 +963,7 @@ function ChromeExtensionHandler() {
this.name = uri; this.name = uri;
this.URI = ioService.newURI(uri, "UTF-8", null); this.URI = ioService.newURI(uri, "UTF-8", null);
this.owner = secMan.getCodebasePrincipal(this.URI); this.owner = (secMan.getCodebasePrincipal || secMan.getSimpleCodebasePrincipal)(this.URI);
this._isPending = true; this._isPending = true;
var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]. var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].

2
resource/schema/repotime.txt
View file

@ -1 +1 @@
2012-11-05 20:05:00 2012-11-06 16:30:00