diff options
Diffstat (limited to 'js/app/controllers')
| -rw-r--r-- | js/app/controllers/itemcontroller.coffee | 10 | ||||
| -rw-r--r-- | js/app/controllers/settingscontroller.coffee | 19 |
2 files changed, 13 insertions, 16 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 |