diff --git a/lib/util.js b/lib/util.js index a1b7da6..6f09dd2 100644 --- a/lib/util.js +++ b/lib/util.js @@ -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;