Same implementation as angular-ui#346

BlueWaterSatellite · Oct 16, 2017 · be1b65c · be1b65c
1 parent b551246
commit be1b65c
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 26 deletions.
diff --git a/dist/ui-leaflet.js b/dist/ui-leaflet.js
diff --git a/dist/ui-leaflet.min.js b/dist/ui-leaflet.min.js
diff --git a/dist/ui-leaflet.min.no-header.js b/dist/ui-leaflet.min.no-header.js
diff --git a/dist/ui-leaflet_dev_mapped.js b/dist/ui-leaflet_dev_mapped.js
diff --git a/dist/ui-leaflet_dev_mapped.js.map b/dist/ui-leaflet_dev_mapped.js.map
diff --git a/src/directives/leaflet.js b/src/directives/leaflet.js
@@ -135,7 +135,7 @@ angular.module('ui-leaflet', ['nemLogging']).directive('leaflet',
             });
 
             scope.$on('$destroy', function () {
-                leafletMapDefaults.reset();
+                leafletMapDefaults.reset(attrs.id);
                 map.remove();
                 leafletData.unresolveMap(attrs.id);
             });

diff --git a/src/services/leafletMapDefaults.js b/src/services/leafletMapDefaults.js
@@ -48,8 +48,11 @@ angular.module('ui-leaflet').factory('leafletMapDefaults', function ($q, leaflet
 
     // Get the _defaults dictionary, and override the properties defined by the user
     return {
-        reset: function () {
-           defaults = {};
+        reset: function (scopeId) {
+           if (!isDefined(scopeId)){
+                scopeId = 'main';
+           }
+           delete defaults[scopeId];
         },
         getDefaults: function (scopeId) {
             var mapId = obtainEffectiveMapId(defaults, scopeId);