From 40516cb14632cbe87a0df6003382eb5b1660bb98 Mon Sep 17 00:00:00 2001
From: Athou
 <jeremihave a default value for readingMode settingepanzer@gmail.com>
Date: Thu, 28 Mar 2013 12:37:45 +0100
Subject: [PATCH] have a default value for the readingMode setting

---
 src/main/webapp/js/controllers.js | 18 +++++++-----------
 src/main/webapp/js/services.js    |  6 ++++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index 719a6768..35a5aa99 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -104,15 +104,13 @@ module.controller('FeedListCtrl', function($scope, $routeParams, $http,
 	$scope.hasMore = true;
 
 	$scope.refreshList = function() {
-		if ($scope.settings.readingMode) {
-			$scope.entryList = EntryService.get({
-				type : $scope.selectedType,
-				id : $scope.selectedId,
-				readType : $scope.settings.readingMode,
-				offset : 0,
-				limit : 30
-			});
-		}
+		$scope.entryList = EntryService.get({
+			type : $scope.selectedType,
+			id : $scope.selectedId,
+			readType : $scope.settings.readingMode,
+			offset : 0,
+			limit : 30
+		});
 	};
 
 	$scope.loadMoreEntries = function() {
@@ -122,8 +120,6 @@ module.controller('FeedListCtrl', function($scope, $routeParams, $http,
 			return;
 		if ($scope.busy)
 			return;
-		if (!$scope.settings.readingMode)
-			return;
 		$scope.busy = true;
 		EntryService.get({
 			type : $scope.selectedType,
diff --git a/src/main/webapp/js/services.js b/src/main/webapp/js/services.js
index 2066a3d2..8fef9e1a 100644
--- a/src/main/webapp/js/services.js
+++ b/src/main/webapp/js/services.js
@@ -118,8 +118,10 @@ module.factory('EntryService', [ '$resource', '$http',
 module.service('SettingsService', function($resource) {
 	var s = {}
 	s.settings = {};
-	s.settings.readMode = 'unread';
-	s.settings = $resource('rest/settings/get').get();
+	s.settings.readingMode = 'unread';
+	$resource('rest/settings/get').get(function(data) {
+		s.settings.readingMode = data.readingMode;
+	});
 	s.save = function() {
 		$resource('rest/settings/save').save(s.settings);
 	};