commit b445283f4ec469d8b39de58542a5f2787008dfa4
parent 9b1b360a7228fcf85d18f50ec80c774b14103aed
Author: Dan Stillman <dstillman@zotero.org>
Date: Wed, 21 Dec 2016 07:48:39 -0500
Closes #974, Unreachable code after return statement
Diffstat:
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
@@ -1056,11 +1056,14 @@
<body>
<![CDATA[
// DEBUG: Valid nsIScrollBoxObject but methods return errors
- return;
-
- var sbo = document.getAnonymousNodes(this)[0].boxObject;
- sbo.QueryInterface(Components.interfaces.nsIScrollBoxObject);
- sbo.scrollTo(0,0);
+ try {
+ var sbo = document.getAnonymousNodes(this)[0].boxObject;
+ sbo.QueryInterface(Components.interfaces.nsIScrollBoxObject);
+ sbo.scrollTo(0,0);
+ }
+ catch (e) {
+ Zotero.logError(e);
+ }
]]>
</body>
</method>
diff --git a/chrome/content/zotero/xpcom/data/feed.js b/chrome/content/zotero/xpcom/data/feed.js
@@ -44,6 +44,9 @@ Zotero.Feed = function(params = {}) {
this._feedCleanupReadAfter = null;
this._feedCleanupUnreadAfter = null;
this._feedRefreshInterval = null;
+ this._feedUnreadCount = null;
+ this._updating = false;
+ this._previousURL = null;
// Feeds are not editable by the user. Remove the setter
this.editable = false;
@@ -69,10 +72,6 @@ Zotero.Feed = function(params = {}) {
return obj[prop];
}
});
- this._feedUnreadCount = null;
-
- this._updating = false;
- this._previousURL = null;
}
Zotero.Feed._colToProp = function(c) {
