From 5a40db90bc430ff76adc1a282253c51ab78ce703 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 6 May 2013 15:05:17 +0200
Subject: [PATCH] scroll to entries only when navigating through click or
 keyboard, not scroll (#62)

---
 src/main/webapp/js/controllers.js         | 2 ++
 src/main/webapp/templates/feeds.view.html | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index 55b5ef7e..514a8c85 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -541,6 +541,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
 
 	$scope.isOpen = SettingsService.settings.viewMode == 'expanded';
 	$scope.entryClicked = function(entry, event) {
+		$scope.navigationMode = 'click';
 		if (!event.ctrlKey && event.which != 2) {
 			if ($scope.current != entry || SettingsService.settings.viewMode == 'expanded') {
 				$scope.isOpen = true;
@@ -608,6 +609,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
 	};
 
 	$scope.onScroll = function(entry) {
+		$scope.navigationMode = 'scroll';
 		if (SettingsService.settings.viewMode == 'expanded') {
 			$scope.current = entry;
 			if(SettingsService.settings.scrollMarks) {
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index d98d0725..612c57c4 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -6,8 +6,8 @@
 	<div infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy || !settingsService.settings.readingMode" infinite-scroll-distance="1" id="feed-accordion"
 		ng-class="{'expanded' : settingsService.settings.viewMode == 'expanded' }">
 		<div ng-show="message && errorCount > 10">Error while loading this feed : {{message}}</div>
-		<div ng-repeat="entry in entries" class="entry" scroll-to="isOpen && current == entry" scroll-to-offset="-58" on-scroll-middle="onScroll(entry)"
-			ng-class="{current: current==entry}">
+		<div ng-repeat="entry in entries" class="entry" scroll-to="navigationMode == 'click' && isOpen && current == entry" scroll-to-offset="-58" 
+			on-scroll-middle="onScroll(entry)" ng-class="{current: current==entry}">
 			<a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="noop($event)" ng-mouseup="entryClicked(entry, $event)"
 				ng-class="{open: current == entry, closed: current != entry}">
 				<span class="feed-name">