Changeset 6763

Timestamp:

04/02/08 07:53:20 (9 months ago)

Author:

elemoine

Message:

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. r=crschmidt (closes #1480) (Pullup #1480)

Files:

• trunk/openlayers/lib/OpenLayers/Util.js (modified) (4 diffs)

trunk/openlayers/lib/OpenLayers/Util.js

@@ -57 +57 @@
-            }
-        }
+
-        /**
-         * IE doesn't include the toString property when iterating over an object's
@@ -62 +63 @@
-         * the source has its own toString property.
-         */
-
+
+
+
+
+
+
+
+
+
+
+
+
-            destination.toString = source.toString;
-        }
@@ -511 +523 @@
- */
-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];
@@ -523 +544 @@
-     * the source has its own toString property.
-     */
-
+!fromIsEvt && 
-       && from.hasOwnProperty('toString') && !to.hasOwnProperty('toString')) {
-        to.toString = from.toString;