feature/settings — Refactor settings service.

jeandat · Feb 29, 2016 · 517fd77 · 517fd77
1 parent 221a07a
commit 517fd77
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/app/app.run.js b/app/app.run.js
@@ -138,8 +138,8 @@
         }
     }
 
-    function applySettings(settingService, $ionicConfig){
-        !settingService.settings.enableAnimations && $ionicConfig.views.transition('none');
+    function applySettings(settingService){
+        settingService.apply();
     }
 
     function boot($state, $cordovaSplashscreen, $timeout, ImgCache, $rootScope, $log) {

diff --git a/app/setting/setting-list.controller.js b/app/setting/setting-list.controller.js
@@ -17,7 +17,7 @@
         /////////////
 
         function activate() {
-            $scope.$watchCollection('vm.settings', settingService.update);
+            $scope.$watchCollection('vm.settings', settingService.applyDiffAndPersist);
         }
 
         function clearCache() {

diff --git a/app/setting/setting.factory.js b/app/setting/setting.factory.js
@@ -13,25 +13,36 @@
 
         var service = {
             settings: _.defaults(localStorageService.get('settings'), defaults),
-            update: update,
+            applyDiffAndPersist: applyDiffAndPersist,
+            apply: apply,
+            persist: persist,
             clearCache: clearCache
         };
 
         return service;
 
         ////////////
 
-        function update(){
-            var settings = service.settings;
-
+        function applyDiffAndPersist(newSettings, oldSettings){
             // enableAnimations property
-            settings.enableAnimations ? enableAnimations() : disableAnimations();
+            newSettings.enableAnimations !== oldSettings.enableAnimations && processEnableAnimations();
+            persist();
+        }
 
+        function persist(){
             // Persist in local storage
-            localStorageService.set('settings', settings);
+            localStorageService.set('settings', service.settings);
             $log.info('Settings persisted');
         }
 
+        function apply(){
+            processEnableAnimations();
+        }
+
+        function processEnableAnimations(){
+            service.settings.enableAnimations ? enableAnimations() : disableAnimations();
+        }
+
         function clearCache() {
             return $q(function (resolve, reject) {