From 98a3c4aeaa787ca375dc94f9916c343182f31d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= <adomas.ven@gmail.com>
Date: Wed, 27 Apr 2016 16:22:43 +0100
Subject: [PATCH] Closes #961. Fixes feed dialogue remove read articles value
 not saving

---
 chrome/content/zotero/feedSettings.xul                     | 6 +++---
 chrome/content/zotero/preferences/preferences_advanced.xul | 4 ++--
 chrome/content/zotero/zoteroPane.js                        | 4 ++--
 chrome/locale/en-US/zotero/zotero.dtd                      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero/feedSettings.xul b/chrome/content/zotero/feedSettings.xul
index 2cc6e2214..241ba3022 100644
--- a/chrome/content/zotero/feedSettings.xul
+++ b/chrome/content/zotero/feedSettings.xul
@@ -7,8 +7,8 @@
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	title="&zotero.feedSettings.title;" buttons="cancel,accept"
 	buttonlabelaccept="&zotero.feedSettings.saveButton.label;"
-	ondialogaccept="Zotero_Feed_Settings.accept()"
-	ondialogcancel="Zotero_Feed_Settings.cancel()"
+	ondialogaccept="return Zotero_Feed_Settings.accept()"
+	ondialogcancel="return Zotero_Feed_Settings.cancel()"
 	id="zotero-feed-settings"
 	onload="Zotero_Feed_Settings.init()">
 	
@@ -49,7 +49,7 @@
 		<vbox id="advanced-options-togglable">
 			<hbox align="center">
 				<label value="&zotero.feedSettings.refresh.label1;" control="feed-ttl"/>
-				<textbox id="feed-ttl" type="number" min="0" increment="1" size="3"/>
+				<textbox id="feed-ttl" type="number" min="1" increment="1" size="3"/>
 				<label value="&zotero.feedSettings.refresh.label2;" control="feed-ttl"/>
 			</hbox>
 			<hbox align="center">
diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul
index 450b87501..aa04324f6 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.xul
+++ b/chrome/content/zotero/preferences/preferences_advanced.xul
@@ -312,14 +312,14 @@
 						<hbox>
 							<hbox align="center">
 								<label value="&zotero.feedSettings.refresh.label1;"/>
-								<textbox maxlength="2" size="2" preference="pref-feeds-defaultTTL"/>
+								<textbox type="number" min="1" increment="1" size="3" preference="pref-feeds-defaultTTL"/>
 								<label value="&zotero.feedSettings.refresh.label2;"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<hbox align="center">
 								<label value="&zotero.feedSettings.cleanupAfter.label1;"/>
-								<textbox maxlength="3" size="3" preference="pref-feeds-defaultCleanupAfter"/>
+								<textbox type="number" min="0" increment="1" size="2" preference="pref-feeds-defaultCleanupAfter"/>
 								<label value="&zotero.feedSettings.cleanupAfter.label2;"/>
 							</hbox>
 						</hbox>
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 85a4880a6..fb9ae5a66 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -2003,7 +2003,7 @@ var ZoteroPane = new function()
 			url: feed.url,
 			title: feed.name,
 			ttl: feed.refreshInterval,
-			cleanAfter: feed.cleanupAfter
+			cleanupAfter: feed.cleanupAfter
 		};
 		
 		window.openDialog('chrome://zotero/content/feedSettings.xul', 
@@ -2012,7 +2012,7 @@ var ZoteroPane = new function()
 		
 		feed.name = data.title;
 		feed.refreshInterval = data.ttl;
-		feed.cleanupAfter = data.cleanAfter;
+		feed.cleanupAfter = data.cleanupAfter;
 		yield feed.saveTx();
 	});
 	
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 356d9b843..5e81de8ed 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -266,7 +266,7 @@
 <!ENTITY zotero.feedSettings.saveButton.label           "Save">
 <!ENTITY zotero.feedSettings.url.label                  "URL:">
 <!ENTITY zotero.feedSettings.title.label                "Title:">
-<!ENTITY zotero.feedSettings.refresh.label1             "Refresh Interval:">
+<!ENTITY zotero.feedSettings.refresh.label1             "Update feed every">
 <!ENTITY zotero.feedSettings.refresh.label2             "hour(s)">
 <!ENTITY zotero.feedSettings.cleanupAfter.label1         "Remove read articles after ">
 <!ENTITY zotero.feedSettings.cleanupAfter.label2         "day(s)">