fix(EventsHelper removeEvents): hasOwnProperty check to protect again…

…t those that override Array.prototype issue #1652
angular-ui · Dec 14, 2015 · 4aa4994 · 4aa4994
1 parent 1f8259d
commit 4aa4994
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 31 deletions.
diff --git a/dist/angular-google-maps-street-view.js b/dist/angular-google-maps-street-view.js
@@ -1,4 +1,4 @@
-/*! angular-google-maps 2.2.1 2015-12-10
+/*! angular-google-maps 2.2.1 2015-12-14
  *  AngularJS directives for Google Maps
  *  git: https://github.com/angular-ui/angular-google-maps.git
  */
@@ -512,7 +512,7 @@ return UUID;
           }
           for (key in listeners) {
             l = listeners[key];
-            if (l) {
+            if (l && listeners.hasOwnProperty(key)) {
               google.maps.event.removeListener(l);
             }
           }

diff --git a/dist/angular-google-maps-street-view.min.js b/dist/angular-google-maps-street-view.min.js
diff --git a/dist/angular-google-maps-street-view_dev_mapped.js b/dist/angular-google-maps-street-view_dev_mapped.js
diff --git a/dist/angular-google-maps-street-view_dev_mapped.js.map b/dist/angular-google-maps-street-view_dev_mapped.js.map
diff --git a/dist/angular-google-maps-street-view_dev_mapped.min.js b/dist/angular-google-maps-street-view_dev_mapped.min.js
diff --git a/dist/angular-google-maps-street-view_dev_mapped.min.js.map b/dist/angular-google-maps-street-view_dev_mapped.min.js.map
diff --git a/dist/angular-google-maps.js b/dist/angular-google-maps.js
@@ -1,4 +1,4 @@
-/*! angular-google-maps 2.2.1 2015-12-10
+/*! angular-google-maps 2.2.1 2015-12-14
  *  AngularJS directives for Google Maps
  *  git: https://github.com/angular-ui/angular-google-maps.git
  */
@@ -965,7 +965,7 @@ Nicholas McCready - https://twitter.com/nmccready
           }
           for (key in listeners) {
             l = listeners[key];
-            if (l) {
+            if (l && listeners.hasOwnProperty(key)) {
               google.maps.event.removeListener(l);
             }
           }
@@ -2500,10 +2500,7 @@ Nicholas McCready - https://twitter.com/nmccready
                 return;
               }
               value = mapArray.getAt(index);
-              if (!value) {
-                return;
-              }
-              if (!value.lng || !value.lat) {
+              if (!(value && value.lng && value.lat)) {
                 return;
               }
               geojsonArray[index][1] = value.lat();

diff --git a/dist/angular-google-maps.min.js b/dist/angular-google-maps.min.js
diff --git a/dist/angular-google-maps_dev_mapped.js b/dist/angular-google-maps_dev_mapped.js
@@ -1,4 +1,4 @@
-/*! angular-google-maps 2.2.1 2015-12-10
+/*! angular-google-maps 2.2.1 2015-12-14
  *  AngularJS directives for Google Maps
  *  git: https://github.com/angular-ui/angular-google-maps.git
  */
@@ -965,7 +965,7 @@ Nicholas McCready - https://twitter.com/nmccready
           }
           for (key in listeners) {
             l = listeners[key];
-            if (l) {
+            if (l && listeners.hasOwnProperty(key)) {
               google.maps.event.removeListener(l);
             }
           }
@@ -2500,10 +2500,7 @@ Nicholas McCready - https://twitter.com/nmccready
                 return;
               }
               value = mapArray.getAt(index);
-              if (!value) {
-                return;
-              }
-              if (!value.lng || !value.lat) {
+              if (!(value && value.lng && value.lat)) {
                 return;
               }
               geojsonArray[index][1] = value.lat();

diff --git a/dist/angular-google-maps_dev_mapped.js.map b/dist/angular-google-maps_dev_mapped.js.map
diff --git a/dist/angular-google-maps_dev_mapped.min.js b/dist/angular-google-maps_dev_mapped.min.js
diff --git a/dist/angular-google-maps_dev_mapped.min.js.map b/dist/angular-google-maps_dev_mapped.min.js.map
diff --git a/src/coffee/directives/api/utils/events-helper.coffee b/src/coffee/directives/api/utils/events-helper.coffee
@@ -28,6 +28,6 @@ angular.module("uiGmapgoogle-maps.directives.api.utils")
   removeEvents: (listeners) ->
     return unless listeners
     for key, l of listeners
-      google.maps.event.removeListener l if l
+      google.maps.event.removeListener(l) if l and listeners.hasOwnProperty(key)
     return
 ]