Skip to content

Commit 840fe76

Browse files
committed
AC-11754: Prototype.js Array.from in conflict with Google Maps API
1 parent c233307 commit 840fe76

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

dev/tests/static/testsuite/Magento/Test/Js/_files/whitelist/magento.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ lib/web/mage/**/*.js
88
lib/web/magnifier/**/*.js
99
lib/web/varien/**/*.js
1010
vendor/magento/**/*.js
11+
lib/web/prototype/**/*.js
12+
lib/web/legacy-build.min.js

lib/web/legacy-build.min.js

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

lib/web/prototype/prototype.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2205,7 +2205,7 @@ Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
22052205

22062206
function remove(element) {
22072207
element = $(element);
2208-
element.parentNode.removeChild(element);
2208+
element.parentNode && element.parentNode.removeChild(element);
22092209
return element;
22102210
}
22112211

0 commit comments

Comments
 (0)