Ticket #1480: patch-1480-r6762-A0.diff

lib/OpenLayers/Util.js

@@ -56 +56 @@
-                destination[property] = value;
-            }
-        }
+
-        /**
-         * IE doesn't include the toString property when iterating over an object's
-         * properties with the for(property in object) syntax.  Explicitly check if
-         * the source has its own toString property.
-         */
-
+
+
+
+
+
+
+
+
+
+
+
+
-            destination.toString = source.toString;
-        }
-    }
@@ -510 +522 @@
- *     in place and returned by this function.
- */
-OpenLayers.Util.applyDefaults = function (to, from) {
+
+    /*
+     * FF/Windows < 2.0.0.13 reports "Illegal operation on WrappedNative
+     * prototype object" when calling hawOwnProperty if the source object is an
+     * instance of window.Event.
+     */
+    var fromIsEvt = typeof window.Event == "function"
+                    && from instanceof window.Event;
+
-    for (var key in from) {
-        if (to[key] === undefined ||
-
+!fromIsEvt && 
-             && from.hasOwnProperty(key) && !to.hasOwnProperty(key))) {
-            to[key] = from[key];
-        }
@@ -522 +543 @@
-     * properties with the for(property in object) syntax.  Explicitly check if
-     * the source has its own toString property.
-     */
-
+!fromIsEvt && 
-       && from.hasOwnProperty('toString') && !to.hasOwnProperty('toString')) {
-        to.toString = from.toString;
-    }