feature/settings — Capacity to empty cache on demand (http + images).

jeandat · Feb 13, 2016 · 67a64ea · 67a64ea
1 parent 43f2cca
commit 67a64ea
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/app/settings/settings.controller.js b/app/settings/settings.controller.js
@@ -5,12 +5,14 @@
         .module('app')
         .controller('SettingsController', SettingsController);
 
-    function SettingsController($log, $scope, $cordovaToast, defaultCacheName, CacheFactory, $ionicPopup, throwErr) {
+    function SettingsController($log, $scope, $cordovaToast, defaultCacheName, CacheFactory,
+                                $ionicPopup, throwErr, ImgCache, $timeout) {
 
         var vm = this;
         vm.settings = {
             enableCache: true
         };
+        vm.clearing = false;
         vm.clearCache = clearCache;
 
         activate();
@@ -24,7 +26,7 @@
             });
         }
 
-        function clearCache(){
+        function clearCache() {
 
             var options = {
                 title: 'Are you sure you want to clear all data cached ?',
@@ -35,9 +37,23 @@
 
             /////////////
 
-            function clear(){
+            function clear() {
+                vm.clearing = true;
                 CacheFactory.get(defaultCacheName).removeAll();
-                $log.info('Default cache is now empty');
+                $log.info('HTTP cache is now empty');
+                ImgCache.clearCache(ok, throwErr);
+
+                /////////////
+
+                function ok() {
+                    $scope.$apply(function () {
+                        $log.info('Image cache is now empty');
+                        // So we could read something at least
+                        $timeout(function () {
+                            vm.clearing = false;
+                        }, 500);
+                    });
+                }
             }
 
         }

diff --git a/app/settings/tab-settings.jade b/app/settings/tab-settings.jade
@@ -4,4 +4,6 @@ ion-view(view-title='Settings')
             ion-toggle(ng-model='vm.settings.enableCache', toggle-class='toggle-positive')
                 | Enable Cache
             ion-item(ng-click='vm.clearCache()')
-                button.button.button-assertive.button-small.button-block Empty cache
+                button.button.button-assertive.button-small.button-block
+                    span(ng-if='vm.clearing') Clearing…
+                    span(ng-if='!vm.clearing') Clear cache