fix(core): Fixed a map destroy bug reported by @porjo here:

#471
tombatossals · Sep 11, 2014 · 7255d91 · 7255d91 · stefanmdt · Apr 1, 2015
1 parent 5e6b73b
commit 7255d91
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/dist/angular-leaflet-directive.js b/dist/angular-leaflet-directive.js
@@ -107,9 +107,7 @@ angular.module("leaflet-directive", []).directive('leaflet', ["$q", "leafletData
             });
 
             scope.$on('$destroy', function () {
-                leafletData.getMap().then(function(map) {
-                    map.remove();
-                });
+                map.remove();
                 leafletData.unresolveMap(attrs.id);
             });
         }

diff --git a/dist/angular-leaflet-directive.min.js b/dist/angular-leaflet-directive.min.js
diff --git a/examples/double-map-toggle-example.html b/examples/double-map-toggle-example.html
@@ -71,11 +71,11 @@
     <h1>Toggle between two maps on screen</h1>
     <p>View javascript console while toggling map</p>
     <button ng-click="togglemap = !togglemap">Toggle Map</button>
-    <div ng-if="togglemap" ng-controller="map1">
+    <div ng-if="!togglemap" ng-controller="map1">
         <h2>Map1</h2>
         <leaflet id="map1" center="center" paths="paths" width="400px" height="320px"></leaflet>
     </div>
-    <div ng-if="!togglemap" ng-controller="map2">
+    <div ng-if="togglemap" ng-controller="map2">
         <h2>Map2</h2>
         <leaflet id="map2" center="center" paths="paths" width="400px" height="320px"></leaflet>
     </div>

diff --git a/src/directives/leaflet.js b/src/directives/leaflet.js
@@ -103,9 +103,7 @@ angular.module("leaflet-directive", []).directive('leaflet', function ($q, leafl
             });
 
             scope.$on('$destroy', function () {
-                leafletData.getMap().then(function(map) {
-                    map.remove();
-                });
+                map.remove();
                 leafletData.unresolveMap(attrs.id);
             });
         }