Changeset 7943

Timestamp:

09/03/08 22:19:41 (3 months ago)

Author:

euzuro

Message:

fixing regression committed in r5280. applyDefaults() again allows for an undefined value as the 'from' parameter. thanks tim for report and review. (Closes #1716)

Files:

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

trunk/openlayers/lib/OpenLayers/Util.js

@@ -564 +564 @@
-     * the source has its own toString property.
-     */
-
+ && from
-       && from.hasOwnProperty('toString') && !to.hasOwnProperty('toString')) {
-        to.toString = from.toString;

trunk/openlayers/tests/Util.html

@@ -170 +170 @@
-    function test_Util_applyDefaults(t) {
-    
-1
+2
-        
-        var to = { 
@@ -205 +205 @@
-        var ret = OpenLayers.Util.applyDefaults(to, from);
-        t.eq(ret.rand, from.rand, "works with undefined to");
+
+        //regression test for #1716 -- allow undefined from
+        try {
+            OpenLayers.Util.applyDefaults({}, undefined);
+            t.ok(true, "no exception thrown when from is undefined");
+        } catch(err) {
+            t.fail("exception thrown when from is undefined:" + err);
+        }
+
-    }
-