Ticket #1063: defaults.patch

lib/OpenLayers/Util.js

@@ -487 +487 @@
-
-/** 
- * 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;
+    }
-};
-
-/**

tests/test_Util.html

@@ -143 +143 @@
-
-    function test_06_Util_applyDefaults(t) {
-    
-4
+6
-        
-        var to = { 
-            'a': "abra",
-
+
+
-        };
-
-        var from = { 
-            'b': "zoink",
-
+
+
+
-        };
-
-        OpenLayers.Util.applyDefaults(to, from);
@@ -161 +164 @@
-        t.eq( to["a"], "abra", "key present in to but not from maintained");
-        t.eq( to["b"], "blorg", "key present in to and from, maintained in to");
-        t.eq( to["c"], "press", "key present in from and not to successfully copied to to");
+        t.eq(to.toString(), "works", "correctly applies custom toString");
+        t.eq(to.n, null, "correctly preserves null");
-    }
-
-    function test_07_Util_getParameterString(t) {