Merge pull request #5605 from Automattic/Fix/reader-prev-next-error

Reader: Fix uncaught error in prev/nextItem selection handling
Automattic · May 30, 2016 · 113b13f · 113b13f
2 parents dec96e3 + 056e698
commit 113b13f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/client/reader/following-stream/index.jsx b/client/reader/following-stream/index.jsx
@@ -233,12 +233,16 @@ module.exports = React.createClass( {
 		return !! window.location.pathname.match( /^\/read\/(blogs|feeds)\/([0-9]+)\/posts\/([0-9]+)$/i );
 	},
 
+	getVisibleItemIndexes: function() {
+		return this._list && this._list.getVisibleItemIndexes( { offsetTop: HEADER_OFFSET_TOP } );
+	},
+
 	selectNextItem: function() {
-		var visibleIndexes = this._list.getVisibleItemIndexes( { offsetTop: HEADER_OFFSET_TOP } ),
+		var visibleIndexes = this.getVisibleItemIndexes(),
 			visibleIndex,
 			index,
 			i;
-		if ( visibleIndexes.length > 0 ) {
+		if ( visibleIndexes && visibleIndexes.length > 0 ) {
 			index = visibleIndexes[ 0 ].index;
 			for ( i = 0; i < visibleIndexes.length; i++ ) {
 				visibleIndex = visibleIndexes[ i ];
@@ -256,11 +260,11 @@ module.exports = React.createClass( {
 	},
 
 	selectPrevItem: function() {
-		var visibleIndexes = this._list.getVisibleItemIndexes( { offsetTop: HEADER_OFFSET_TOP } ),
+		var visibleIndexes = this.getVisibleItemIndexes(),
 			visibleIndex,
 			index,
 			i;
-		if ( visibleIndexes.length > 0 ) {
+		if ( visibleIndexes && visibleIndexes.length > 0 ) {
 			index = visibleIndexes[ 0 ].index;
 			for ( i = 0; i < visibleIndexes.length; i++ ) {
 				visibleIndex = visibleIndexes[ i ];