From 7e67a344441cd16862d15b3dcd5a4b99806919aa Mon Sep 17 00:00:00 2001 From: Aurimas Vinckevicius Date: Sat, 21 Feb 2015 20:35:39 -0600 Subject: [PATCH 1/3] [WebPageDump] Fix regression from 5f8b56ef86a898caf1449eeefd198ba6e0247d4b --- chrome/content/zotero/webpagedump/common.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/chrome/content/zotero/webpagedump/common.js b/chrome/content/zotero/webpagedump/common.js index 658326338..652341bdd 100644 --- a/chrome/content/zotero/webpagedump/common.js +++ b/chrome/content/zotero/webpagedump/common.js @@ -651,10 +651,13 @@ var wpdCommon = { if (MODE_SIMULATE) return true; try { //new obj_URI object - var obj_URI = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService).newURI(aSourceURL, null, null); + var obj_URI = Components.classes["@mozilla.org/network/io-service;1"] + .getService(Components.interfaces.nsIIOService) + .newURI(aSourceURL, null, null); //new file object - var obj_TargetFile = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile); + var obj_TargetFile = Components.classes["@mozilla.org/file/local;1"] + .createInstance(Components.interfaces.nsILocalFile); //set file with path // NOTE: This function has a known bug on the macintosh and other OSes // which do not represent file locations as paths. If you do use this @@ -662,17 +665,19 @@ var wpdCommon = { obj_TargetFile.initWithPath(aTargetFilename); //new persistence object - var obj_Persist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"].createInstance(Components.interfaces.nsIWebBrowserPersist); + var obj_Persist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"] + .createInstance(Components.interfaces.nsIWebBrowserPersist); // set flags const nsIWBP = Components.interfaces.nsIWebBrowserPersist; - var flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES | nsIWBP.PERSIST_FLAGS_FROM_CACHE; + var flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES + | nsIWBP.PERSIST_FLAGS_FROM_CACHE; //nsIWBP.PERSIST_FLAGS_BYPASS_CACHE; obj_Persist.persistFlags = flags; // has the url the same filetype like the file extension? //save file to target - Zotero.Utilities.Internal.saveURI(wbp, obj_URI, obj_TargetFile); + Zotero.Utilities.Internal.saveURI(obj_Persist, obj_URI, obj_TargetFile); return true; From aeb7b83a39250983c196031742b1d25213e633bb Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 21 Feb 2015 21:52:06 -0500 Subject: [PATCH 2/3] Update versions --- install.rdf | 2 +- resource/config.js | 2 +- update.rdf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.rdf b/install.rdf index 9368c50ca..e31cba70e 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 4.0.26.SOURCE + 4.0.26.1.SOURCE Center for History and New Media
George Mason University Dan Cohen Sean Takats diff --git a/resource/config.js b/resource/config.js index 05b5fff0c..242291a5b 100644 --- a/resource/config.js +++ b/resource/config.js @@ -13,7 +13,7 @@ var ZOTERO_CONFIG = { BOOKMARKLET_ORIGIN: 'https://www.zotero.org', HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org', BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/', - VERSION: '4.0.26.SOURCE' + VERSION: '4.0.26.1.SOURCE' }; EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"]; diff --git a/update.rdf b/update.rdf index a2f9b1ddd..7bb8ebefc 100644 --- a/update.rdf +++ b/update.rdf @@ -7,7 +7,7 @@ - 4.0.26.SOURCE + 4.0.26.1.SOURCE {ec8030f7-c20a-464f-9b0e-13a3a9e97384} From 48f6de7ad1f487f184a4efd333caf5caca9bdb63 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Sat, 14 Mar 2015 18:28:05 -0400 Subject: [PATCH 3/3] Move Safari items to root images directory, part 1 --- chrome/content/zotero/xpcom/connector/cachedTypes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/connector/cachedTypes.js b/chrome/content/zotero/xpcom/connector/cachedTypes.js index bdc075187..c432f3823 100644 --- a/chrome/content/zotero/xpcom/connector/cachedTypes.js +++ b/chrome/content/zotero/xpcom/connector/cachedTypes.js @@ -87,7 +87,7 @@ Zotero.Connector_Types = new function() { } else if(Zotero.isChrome) { return chrome.extension.getURL("images/"+icon); } else if(Zotero.isSafari) { - return safari.extension.baseURI+"images/itemTypes/"+icon; + return safari.extension.baseURI+"images/"+icon; } }; }