Skip to content

Commit 4aa4994

Browse files
committed
fix(EventsHelper removeEvents): hasOwnProperty check to protect againt those that override Array.prototype issue angular-ui#1652
1 parent 1f8259d commit 4aa4994

13 files changed

+25
-31
lines changed

dist/angular-google-maps-street-view.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.2.1 2015-12-10
1+
/*! angular-google-maps 2.2.1 2015-12-14
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/
@@ -512,7 +512,7 @@ return UUID;
512512
}
513513
for (key in listeners) {
514514
l = listeners[key];
515-
if (l) {
515+
if (l && listeners.hasOwnProperty(key)) {
516516
google.maps.event.removeListener(l);
517517
}
518518
}

dist/angular-google-maps-street-view.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps-street-view_dev_mapped.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps-street-view_dev_mapped.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps-street-view_dev_mapped.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps-street-view_dev_mapped.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.2.1 2015-12-10
1+
/*! angular-google-maps 2.2.1 2015-12-14
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/
@@ -965,7 +965,7 @@ Nicholas McCready - https://twitter.com/nmccready
965965
}
966966
for (key in listeners) {
967967
l = listeners[key];
968-
if (l) {
968+
if (l && listeners.hasOwnProperty(key)) {
969969
google.maps.event.removeListener(l);
970970
}
971971
}
@@ -2500,10 +2500,7 @@ Nicholas McCready - https://twitter.com/nmccready
25002500
return;
25012501
}
25022502
value = mapArray.getAt(index);
2503-
if (!value) {
2504-
return;
2505-
}
2506-
if (!value.lng || !value.lat) {
2503+
if (!(value && value.lng && value.lat)) {
25072504
return;
25082505
}
25092506
geojsonArray[index][1] = value.lat();

dist/angular-google-maps.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps_dev_mapped.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.2.1 2015-12-10
1+
/*! angular-google-maps 2.2.1 2015-12-14
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/
@@ -965,7 +965,7 @@ Nicholas McCready - https://twitter.com/nmccready
965965
}
966966
for (key in listeners) {
967967
l = listeners[key];
968-
if (l) {
968+
if (l && listeners.hasOwnProperty(key)) {
969969
google.maps.event.removeListener(l);
970970
}
971971
}
@@ -2500,10 +2500,7 @@ Nicholas McCready - https://twitter.com/nmccready
25002500
return;
25012501
}
25022502
value = mapArray.getAt(index);
2503-
if (!value) {
2504-
return;
2505-
}
2506-
if (!value.lng || !value.lat) {
2503+
if (!(value && value.lng && value.lat)) {
25072504
return;
25082505
}
25092506
geojsonArray[index][1] = value.lat();

dist/angular-google-maps_dev_mapped.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)