1
0
Fork 0

attempt_override() within propCopy() no longer needed after previous commit

closure/master
Mike Gerwitz 2010-12-07 00:49:00 -05:00
parent eced0a7e91
commit 459335cf62
1 changed files with 16 additions and 21 deletions

View File

@ -179,26 +179,6 @@ exports.propCopy = function( props, dest, result_data )
abstract_map[ method ] = i;
}
function attempt_override( name, pre, func, data )
{
if ( pre instanceof Function )
{
return method_override(
pre,
func,
name,
abstract_map,
abstract_methods,
data
);
}
else
{
// todo: attempted override of property with abstract method
return null;
}
}
// default functionality
var actions = {
each: function( name, value )
@ -235,7 +215,22 @@ exports.propCopy = function( props, dest, result_data )
// check for override
if ( pre !== undefined )
{
dest[ name ] = attempt_override( name, pre, func, data );
if ( pre instanceof Function )
{
dest[ name ] = method_override(
pre,
func,
name,
abstract_map,
abstract_methods,
data
);
}
else
{
// todo: attempted override of property with method
}
if ( data.abstractModified )
{
abstract_regen = true;