Merge pull request #4 from hofff/feature/ajax-optout

Fix javascript error in IE 11
menatwork · Aug 31, 2018 · 5169c65 · 5169c65
2 parents ac85790 + 1f21d53
commit 5169c65
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Resources/public/js/optout.js b/src/Resources/public/js/optout.js
@@ -90,9 +90,16 @@ matomoOptOut.prototype.api = function (method) {
 };
 
 matomoOptOut.prototype.merge = function (object, src) {
-    var extended = Object.assign({}, object);
+    var extended = {};
+    var key;
 
-    for (var key in src) {
+    for (key in object) {
+        if (object.hasOwnProperty(key)) {
+            extended[key] = object[key];
+        }
+    }
+
+    for (key in src) {
         if (src.hasOwnProperty(key)) {
             extended[key] = src[key];
         }

diff --git a/src/Resources/public/js/optout.min.js b/src/Resources/public/js/optout.min.js