Skip to content

Commit 6c69062

Browse files
committed
Fix bug in marker manager where marker deleted then removed, angular-ui#476
1 parent 16b09ac commit 6c69062

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

dist/angular-google-maps.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 1.2.0 2014-08-05
1+
/*! angular-google-maps 1.2.0 2014-08-06
22
* AngularJS directives for Google Maps
33
* git: https://github.com/nlaplante/angular-google-maps.git
44
*/
@@ -5896,9 +5896,11 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
58965896
};
58975897

58985898
MarkerParentModel.prototype.setGMarker = function(gMarker) {
5899+
var ret;
58995900
if (this.scope.gMarker) {
5901+
ret = this.gMarkerManager.remove(this.scope.gMarker, false);
59005902
delete this.scope.gMarker;
5901-
this.gMarkerManager.remove(this.scope.gMarker, false);
5903+
ret;
59025904
}
59035905
this.scope.gMarker = gMarker;
59045906
if (this.scope.gMarker) {

src/coffee/directives/api/models/parent/marker-parent-model.coffee

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ angular.module("google-maps.directives.api.models.parent")
5252

5353
setGMarker: (gMarker) =>
5454
if @scope.gMarker
55+
ret = @gMarkerManager.remove @scope.gMarker, false
5556
delete @scope.gMarker
56-
@gMarkerManager.remove @scope.gMarker, false
57+
ret
5758
@scope.gMarker = gMarker
5859
if @scope.gMarker
5960
@scope.gMarker.key = @scope.idKey

0 commit comments

Comments
 (0)