remove favorite from map

prevostc · Mar 7, 2015 · 314ecff · 314ecff
1 parent 3ee5c1f
commit 314ecff
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/www/js/controllers.js b/www/js/controllers.js
@@ -12,8 +12,8 @@
 
     angular.module('starter.controllers', [])
 
-        .controller('MapCtrl', ['$scope', '$ionicPlatform', 'Settings', 'Favorites', 'Image', 'Faker', 'Id',
-            function ($scope, $ionicPlatform, Settings, Favorites, Image, Faker, Id) {
+        .controller('MapCtrl', ['$scope', '$ionicPlatform', '$timeout', 'Settings', 'Favorites', 'Image', 'Faker', 'Id',
+            function ($scope, $ionicPlatform, $timeout, Settings, Favorites, Image, Faker, Id) {
 
                 $scope.generate = function () {
                     // generate map tiles
@@ -43,9 +43,15 @@
                 };
 
                 $scope.starred = false;
-                $scope.star = function () {
-                    Favorites.save($scope.mapData);
-                    $scope.starred = true;
+                $scope.starToggle = function () {
+                    $timeout(function(){
+                        $scope.starred = !$scope.starred;
+                        if ($scope.starred) {
+                            Favorites.save($scope.mapData);
+                        } else {
+                            Favorites.remove($scope.mapData);
+                        }
+                    });
                 };
             }])
 
@@ -109,14 +115,22 @@
                         $scope.items = Favorites.fetchAll();
                     });
                 });
+                $scope.$on('$ionicView.leave', function (event, data) {
+                    $timeout(function () {
+                        $ionicListDelegate.showDelete(false);
+                        $scope.items = Favorites.fetchAll();
+                    });
+                });
 
                 $scope.toggleDeleteButtons = function () {
                     $ionicListDelegate.showDelete(!$ionicListDelegate.showDelete());
                 };
 
                 $scope.deleteItem = function (mapData) {
-                    Favorites.remove(mapData);
-                    $scope.items = Favorites.fetchAll();
+                    $timeout(function () {
+                        Favorites.remove(mapData);
+                        $scope.items = Favorites.fetchAll();
+                    });
                 };
             }])
 

diff --git a/www/templates/tab-map.html b/www/templates/tab-map.html
@@ -3,7 +3,7 @@
     <ion-nav-buttons side="right">
         <button ng-if="mapData.map"
                 class="button button-icon icon-right icon favorite-button"
-                ng-class="{'ion-checkmark': starred, 'ion-star': !starred}" ng-click="star()">
+                ng-class="{'ion-checkmark': starred, 'ion-star': !starred}" ng-click="starToggle()">
         </button>
     </ion-nav-buttons>
     <ion-content class="padding" scroll="false">