Changeset 5280

Timestamp:

11/26/07 23:34:50 (1 year ago)

Author:

tschaub

Message:

applyDefaults now respects null - if you want to override a property with applyDefaults, set it to undefined first - applyDefaults also now correctly applies a custom toString method (closes #1063).

Files:

• trunk/openlayers/lib/OpenLayers/Util.js (modified) (1 diff)
• trunk/openlayers/tests/test_Util.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Util.js

@@ -490 +490 @@
-/** 
- * Function: applyDefaults
- hashtable and copies any key
-hashtable
+n object and copies any propertie
+properties
- *     Prototype.js.
- * 
- * Parameters:
-
-
+
+
+
+
+
+
+
- */
-OpenLayers.Util.applyDefaults = function (to, from) {
-    for (var key in from) {
-
+
+
+
-            to[key] = from[key];
-        }
-    }
+    /**
+     * 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.
+     */
+    if(from.hasOwnProperty
+       && from.hasOwnProperty('toString') && !to.hasOwnProperty('toString')) {
+        to.toString = from.toString;
+    }
+    
-    return to;
-};

trunk/openlayers/tests/test_Util.html

@@ -142 +142 @@
-    }
-
-06_
-
-8
+
+
+10
-        
-        var to = { 
-            'a': "abra",
-
+
+
-        };
-
-        var from = { 
-            'b': "zoink",
-
+
+
+
-        };
-
@@ -168 +171 @@
-        t.eq( ret["b"], "blorg", "key present in ret and from, maintained in ret");
-        t.eq( ret["c"], "press", "key present in from and not ret successfully copied to ret");
+        t.eq(to.toString(), "works", "correctly applies custom toString");
+        t.eq(to.n, null, "correctly preserves null");
-    }
-