ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#837 - modify Util.extend to deal with custom toString property - IE doesn't iterate over toString, this patch fixes this behavior for Util.extend

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@3760 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2007-07-16 16:35:02 +00:00
parent b31101d7f7
commit cae56a65f0
2 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/OpenLayers/Util.js
View File

@@ -36,12 +36,30 @@ if ($ == null) {
} }
/** /**
* Function: extend * APIFunction: extend
* From Prototype.js * Copy all properties of a source object to a destination object. Modifies
* the passed in destination object.
*
* Parameters:
* destination - {Object} The object that will be modified
* source - {Object} The object with properties to be set on the destination
*
* Returns:
* {Object} The destination object.
*/ */
OpenLayers.Util.extend = function(destination, source) { OpenLayers.Util.extend = function(destination, source) {
for (property in source) { if(destination && source) {
destination[property] = source[property]; for(property in source) {
destination[property] = source[property];
}
/**
* 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(source.hasOwnProperty && source.hasOwnProperty('toString')) {
destination.toString = source.toString;
}
} }
return destination; return destination;
}; };

28
tests/test_Util.html
View File

@@ -578,7 +578,33 @@
t.eq(OpenLayers.Util.getArgs('http://www.example.com?foo=bar#bugssucks'), t.eq(OpenLayers.Util.getArgs('http://www.example.com?foo=bar#bugssucks'),
{'foo': 'bar'}, "getArgs works when using a fragment identifier"); {'foo': 'bar'}, "getArgs works when using a fragment identifier");
} }
// -->
function tests_Util_extend(t) {
t.plan(4);
var source = {
num: Math.random(),
obj: {
foo: "bar"
},
method: function() {
return "method";
},
toString: function() {
return "source";
}
};
var destination = OpenLayers.Util.extend({}, source);
t.eq(destination.num, source.num,
"extend properly sets primitive property on destination");
t.eq(destination.obj, source.obj,
"extend properly sets object property on destination");
t.eq(destination.method(), "method",
"extend properly sets function property on destination");
t.eq(destination.toString(), "source",
"extend properly sets custom toString method");
}
// -->
</script> </script>
</head> </head>
<body> <body>