Fix marked as read on scroll when collapsed

maddyblue · Jan 4, 2015 · 9db1282 · 9db1282
1 parent 2b63467
commit 9db1282
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/static/js/site.js b/app/static/js/site.js
@@ -794,8 +794,8 @@ goReadAppModule.controller('GoreadCtrl', function($scope, $http, $timeout, $wind
 	$scope.onScroll = _.debounce(function() {
 		$scope.$apply(function() {
 			$scope.applyGetFeed();
-			$scope.scrollRead();
 			$scope.collapsed = $(window).width() <= 768;
+			$scope.scrollRead();
 			$scope.checkLoadNextPage();
 		});
 	}, 100);
@@ -826,7 +826,8 @@ goReadAppModule.controller('GoreadCtrl', function($scope, $http, $timeout, $wind
 	$window.onresize = $scope.onScroll;
 
 	$scope.scrollRead = function() {
-		if (!$scope.opts.scrollRead || !$scope.opts.expanded) return;
+		if (!$scope.opts.scrollRead || !$scope.opts.expanded || scope.collapsed)
+			return;
 		var sl = $('#story-list');
 		var slh = sl.height();
 		var sle = sl[0];