first commit, nothing working yet

9 files changed, 54 insertions, 166 deletions

diff --git a/js/app/controllers/itemcontroller.coffee b/js/app/controllers/itemcontroller.coffee
index f381baede..94c3cd159 100644
--- a/js/app/controllers/itemcontroller.coffee
+++ b/js/app/controllers/itemcontroller.coffee
@@ -23,15 +23,15 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 angular.module('News').controller 'ItemController',
 ['$scope', 'ItemBusinessLayer', 'FeedModel', 'FeedLoading', 'FeedBusinessLayer',
-'Language', 'AutoPageLoading', 'Compact',
+'Language', 'AutoPageLoading', 'Settings',
 ($scope, ItemBusinessLayer, FeedModel, FeedLoading, FeedBusinessLayer,
-Language, AutoPageLoading, Compact) ->
+Language, AutoPageLoading, Settings) ->
 
 	class ItemController
 
 		constructor: (@_$scope, @_itemBusinessLayer, @_feedModel,
 		              @_feedLoading, @_autoPageLoading, @_feedBusinessLayer,
-		              @_language, @_compact) ->
+		              @_language, @_settings) ->
 			@_autoPaging = true
 
 			@_$scope.itemBusinessLayer = @_itemBusinessLayer
@@ -75,10 +75,10 @@ Language, AutoPageLoading, Compact) ->
 
 
 			@_$scope.isCompactView = =>
-				return @_compact.isCompact()
+				return @_settings.get('compact')
 
 
 	return new ItemController($scope, ItemBusinessLayer, FeedModel, FeedLoading,
 	                          AutoPageLoading, FeedBusinessLayer, Language,
-	                          Compact)
+	                          Settings)
 ]
\ No newline at end of file
diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee
index 66f7f8824..9190ebad5 100644
--- a/js/app/controllers/settingscontroller.coffee
+++ b/js/app/controllers/settingscontroller.coffee
@@ -22,16 +22,14 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 
 angular.module('News').controller 'SettingsController',
-['$scope', 'FeedBusinessLayer', 'FolderBusinessLayer', 'ShowAll',
-'Persistence', 'Compact',
-($scope, FeedBusinessLayer, FolderBusinessLayer, ShowAll, Persistence,
-Compact) ->
+['$scope', 'FeedBusinessLayer', 'FolderBusinessLayer', 'Persistence', 'Settings',
+($scope, FeedBusinessLayer, FolderBusinessLayer, Persistence, Settings) ->
 
 	$scope.feedBusinessLayer = FeedBusinessLayer
 
 	$scope.import = (fileContent) ->
 		$scope.error = false
-		ShowAll.setShowAll(true)
+		Settings.set('showAll', true)
 
 		try
 			FolderBusinessLayer.import(fileContent)
@@ -52,12 +50,11 @@ Compact) ->
 			$scope.loading = false
 
 
-	$scope.setCompactView = (isCompact) ->
-		Compact.handle(!Compact.isCompact())
+	$scope.toggleSetting = (key) ->
+		Settings.set(key, !Settings.get(key))
+		Persistence.setSettings(Settings.getSettings())
 
-		Persistence.userSettingsSetCompact(Compact.isCompact())
-
-	$scope.isCompactView = ->
-		return Compact.isCompact()
+	$scope.getSetting = (key) ->
+		return Settings.get(key)
 
 ]
\ No newline at end of file
diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee
index 2700caeb5..c82b7de87 100644
--- a/js/app/services/businesslayer/feedbusinesslayer.coffee
+++ b/js/app/services/businesslayer/feedbusinesslayer.coffee
@@ -22,15 +22,15 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 
 angular.module('News').factory 'FeedBusinessLayer',
-['_BusinessLayer', 'ShowAll', 'Persistence', 'ActiveFeed', 'FeedType',
+['_BusinessLayer', 'Settings', 'Persistence', 'ActiveFeed', 'FeedType',
 'ItemModel', 'FeedModel', 'NewLoading', '_ExistsError', 'Utils', '$rootScope',
 'NewestItem',
-(_BusinessLayer, ShowAll, Persistence, ActiveFeed, FeedType, ItemModel,
+(_BusinessLayer, Settings, Persistence, ActiveFeed, FeedType, ItemModel,
 FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)->
 
 	class FeedBusinessLayer extends _BusinessLayer
 
-		constructor: (@_showAll, @_feedModel, persistence, activeFeed, feedType,
+		constructor: (@_settings, @_feedModel, persistence, activeFeed, feedType,
 			          itemModel, @_newLoading, @_utils, $rootScope,
 			          @_newestItem) ->
 			super(activeFeed, persistence, itemModel, feedType.Feed, $rootScope)
@@ -94,7 +94,7 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)->
 
 		
 		isVisible: (feedId) ->
-			if @isActive(feedId) or @_showAll.getShowAll()
+			if @isActive(feedId) or @_settings.get('showAll')
 				return true
 			else
 				return @_feedModel.getFeedUnreadCount(feedId) > 0
@@ -111,7 +111,7 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)->
 
 
 		setShowAll: (showAll) ->
-			@_showAll.setShowAll(showAll)
+			@_settings.set('showAll', showAll)
 
 			# TODO: this callback is not tested with a unittest
 			callback = =>
@@ -124,14 +124,12 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)->
 					=>
 						@_newLoading.decrease()
 				)
-			if showAll
-				@_persistence.userSettingsReadShow(callback)
-			else
-				@_persistence.userSettingsReadHide(callback)
+
+			@_persistence.setSettings(@_settings.getSettings(), callback)
 
 
 		isShowAll: ->
-			return @_showAll.getShowAll()
+			return @_settings.get('showAll')
 
 
 		getAll: ->
@@ -189,7 +187,7 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)->
 			@_persistence.importArticles(json, onSuccess)
 
 
-	return new FeedBusinessLayer(ShowAll, FeedModel, Persistence, ActiveFeed,
+	return new FeedBusinessLayer(Settings, FeedModel, Persistence, ActiveFeed,
 	                             FeedType, ItemModel, NewLoading, Utils,
 	                             $rootScope, NewestItem)
 
diff --git a/js/app/services/businesslayer/folderbusinesslayer.coffee b/js/app/services/businesslayer/folderbusinesslayer.coffee
index 60bde1c4e..df2f80dd4 100644
--- a/js/app/services/businesslayer/folderbusinesslayer.coffee
+++ b/js/app/services/businesslayer/folderbusinesslayer.coffee
@@ -23,15 +23,15 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 angular.module('News').factory 'FolderBusinessLayer',
 ['_BusinessLayer', 'FolderModel', 'FeedBusinessLayer', 'Persistence',
-'FeedType', 'ActiveFeed', 'ItemModel', 'ShowAll', '_ExistsError', 'OPMLParser',
+'FeedType', 'ActiveFeed', 'ItemModel', 'Settings', '_ExistsError', 'OPMLParser',
 'NewestItem', 'FeedModel', '$rootScope',
 (_BusinessLayer, FolderModel, FeedBusinessLayer, Persistence, FeedType,
-ActiveFeed, ItemModel, ShowAll, _ExistsError, OPMLParser, NewestItem,
+ActiveFeed, ItemModel, Settings, _ExistsError, OPMLParser, NewestItem,
 FeedModel, $rootScope) ->
 
 	class FolderBusinessLayer extends _BusinessLayer
 
-		constructor: (@_folderModel, @_feedBusinessLayer, @_showAll, activeFeed,
+		constructor: (@_folderModel, @_feedBusinessLayer, @_settings, activeFeed,
 			          persistence, @_feedType, itemModel, @_opmlParser,
 			          @_newestItem, @_feedModel, $rootScope) ->
 			super(activeFeed, persistence, itemModel, @_feedType.Folder, $rootScope)
@@ -105,7 +105,7 @@ FeedModel, $rootScope) ->
 			
 
 		isVisible: (folderId) ->
-			if @_showAll.getShowAll() ||
+			if @_settings.get('showAll') ||
 			@_feedBusinessLayer.getFeedsOfFolder(folderId).length == 0
 				return true
 			else
@@ -201,7 +201,7 @@ FeedModel, $rootScope) ->
 								console.info error
 
 
-	return new FolderBusinessLayer(FolderModel, FeedBusinessLayer, ShowAll,
+	return new FolderBusinessLayer(FolderModel, FeedBusinessLayer, Settings,
 	                               ActiveFeed, Persistence, FeedType, ItemModel,
 	                               OPMLParser, NewestItem, FeedModel, $rootScope)
 
diff --git a/js/app/services/compact.coffee b/js/app/services/compact.coffee
deleted file mode 100644
index 55f96fb59..000000000
--- a/js/app/services/compact.coffee
+++ /dev/null
@@ -1,38 +0,0 @@
-###
-
-ownCloud - News
-
-@author Bernhard Posselt
-@copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-License as published by the Free Software Foundation; either
-version 3 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-You should have received a copy of the GNU Affero General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-
-###
-
-angular.module('News').factory 'Compact', ->
-
-	class Compact
-
-		constructor: ->
-			@_compact = false
-
-		isCompact: ->
-			return @_compact
-
-		handle: (data) ->
-			@_compact = data
-
-
-	return new Compact()
-
diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee
index 4005cf56b..d24a82d62 100644
--- a/js/app/services/persistence.coffee
+++ b/js/app/services/persistence.coffee
@@ -440,34 +440,6 @@ $rootScope, $q) ->
 		###
 			USERSETTINGS CONTROLLER
 		###
-		userSettingsReadShow: (callback) ->
-			###
-			Sets the reader mode to show all
-			###
-			data =
-				showAll: true
-			@setSettings data, callback
-
-
-		userSettingsReadHide: (callback) ->
-			###
-			Sets the reader mode to show only unread
-			###
-			data =
-				showAll: false
-			@setSettings data, callback
-
-
-		userSettingsSetCompact: (isCompact) ->
-			###
-			sets all items of a folder as read
-			###
-			data =
-				compact: isCompact
-
-			@setSettings data
-
-
 		setSettings: (settings, onSuccess) ->
 			onSuccess or= ->
 			data =
diff --git a/js/app/services/services.coffee b/js/app/services/services.coffee
index bc9c32cd2..2fd8eee01 100644
--- a/js/app/services/services.coffee
+++ b/js/app/services/services.coffee
@@ -44,22 +44,21 @@ angular.module('News').factory 'NewLoading', ['_Loading', (_Loading) ->
 
 
 angular.module('News').factory 'Publisher',
-['_Publisher', 'ActiveFeed', 'ShowAll', 'StarredCount', 'ItemModel',
-'FolderModel', 'FeedModel', 'Language', 'NewestItem', 'Compact',
-(_Publisher, ActiveFeed, ShowAll, StarredCount, ItemModel,
-FolderModel, FeedModel, Language, NewestItem, Compact) ->
+['_Publisher', 'ActiveFeed', 'StarredCount', 'ItemModel',
+'FolderModel', 'FeedModel', 'Language', 'NewestItem', 'Settings',
+(_Publisher, ActiveFeed, StarredCount, ItemModel,
+FolderModel, FeedModel, Language, NewestItem, Settings) ->
 
 	# register items at publisher to automatically add incoming items
 	publisher = new _Publisher()
 	publisher.subscribeObjectTo(ActiveFeed, 'activeFeed')
-	publisher.subscribeObjectTo(ShowAll, 'showAll')
 	publisher.subscribeObjectTo(Language, 'language')
 	publisher.subscribeObjectTo(StarredCount, 'starred')
 	publisher.subscribeObjectTo(FolderModel, 'folders')
 	publisher.subscribeObjectTo(FeedModel, 'feeds')
 	publisher.subscribeObjectTo(ItemModel, 'items')
 	publisher.subscribeObjectTo(NewestItem, 'newestItemId')
-	publisher.subscribeObjectTo(Compact, 'compact')
+	publisher.subscribeObjectTo(Settings, 'settings')
 
 	return publisher
 ]
diff --git a/js/app/services/language.coffee b/js/app/services/settings.coffee
index b05387689..8497f13a6 100644
--- a/js/app/services/language.coffee
+++ b/js/app/services/settings.coffee
@@ -20,12 +20,16 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 ###
 
-angular.module('News').factory 'Language', ->
+angular.module('News').factory 'Settings', ->
 
-	class Language
+	class Settings
 
 		constructor: ->
-			@_language = 'en'
+			@_settings =
+				compact: false
+				preventReadOnScroll: false
+				oldestFirst: false
+				language: 'en'
 			@_langs = [
 				'ar-ma'
 				'ar'
@@ -77,28 +81,28 @@ angular.module('News').factory 'Language', ->
 				'zh-tw'
 			]
 
+		get: (key) ->
+			return @_settings[key]
+
+		set: (key, value) ->
+			@_settings[key] = value
+
+		getSettings: ->
+			return @_settings
 
 		handle: (data) ->
 			# fix broken server locales
-			data = data.replace('_', '-').toLowerCase()
+			language = data.language.replace('_', '-').toLowerCase()
 
 			# check if the first part is available, if so use this
-			if not (data in @_langs)
-				data = data.split('-')[0]
+			if not (language in @_langs)
+				language = language.split('-')[0]
 
 			# if its not available default to english
-			if not (data in @_langs)
-				data = 'en'
-
-			@_language = data
-
-
-		getLanguage: ->
-			return @_language
-
+			if not (language in @_langs)
+				language = 'en'
 
-		getMomentFromTimestamp: (timestamp) ->
-			return moment.unix(timestamp).lang(@_language)
+			@_settings = data
 
 
-	return new Language()
+	return new Settings()
\ No newline at end of file
diff --git a/js/app/services/showall.coffee b/js/app/services/showall.coffee
deleted file mode 100644
index ec4795f80..000000000
--- a/js/app/services/showall.coffee
+++ /dev/null
@@ -1,44 +0,0 @@
-###
-
-ownCloud - News
-
-@author Bernhard Posselt
-@copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-License as published by the Free Software Foundation; either
-version 3 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-You should have received a copy of the GNU Affero General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-
-###
-
-
-angular.module('News').factory 'ShowAll', ->
-	
-	class ShowAll
-
-		constructor: ->
-			@_showAll = false
-
-
-		handle: (data) ->
-			@_showAll = data
-
-
-		getShowAll: ->
-			return @_showAll
-
-
-		setShowAll: (showAll) ->
-			@_showAll = showAll
-
-
-	return new ShowAll()