GNU
/
easejs
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into doc/master

closure/master
Mike Gerwitz 2011-03-14 18:17:03 -04:00
parent 397a106112 7b766c1b14
commit cb99ec256c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/class.js
View File

@ -635,11 +635,11 @@ var extend = ( function( extending )
|| ( ( cname )
? function()
{
return '[object #<' + cname + '>]';
return '#<' + cname + '>';
}
: function()
{
return '[object #<anonymous>]';
return '#<anonymous>';
}
)
;
@ -648,8 +648,8 @@ var extend = ( function( extending )
// provide a more intuitive string representation
__self.toString = ( cname )
? function() { return '[object Class <' + cname + '>]'; }
: function() { return '[object Class]'; }
? function() { return cname; }
: function() { return '(Class)'; }
;
return __self;
@ -671,11 +671,11 @@ var extend = ( function( extending )
__abstract_self.toString = ( cname )
? function()
{
return '[object AbstractClass <' + cname + '>]';
return cname;
}
: function()
{
return '[object AbstractClass]';
return '(AbstractClass)';
}
;

16
test/test-class-name.js
View File

@ -122,14 +122,14 @@ var common = require( './common' ),
// concrete
assert.equal(
Class( {} ).toString(),
'[object Class]',
'(Class)',
"Converting anonymous class to string yields class string"
);
// abstract
assert.equal(
Class( { 'abstract foo': [] } ).toString(),
'[object AbstractClass]',
'(AbstractClass)',
"Converting abstract anonymous class to string yields class string"
);
} )();
@ -146,14 +146,14 @@ var common = require( './common' ),
// concrete
assert.equal(
Class( name, {} ).toString(),
'[object Class <' + name + '>]',
name,
"Converting named class to string yields string with name of class"
);
// abstract
assert.equal(
Class( name, { 'abstract foo': [] } ).toString(),
'[object AbstractClass <' + name + '>]',
name,
"Converting abstract named class to string yields string with name " +
"of class"
);
@ -175,7 +175,7 @@ var common = require( './common' ),
// anonymous
assert.equal(
anon.toString(),
'[object #<anonymous>]',
'#<anonymous>',
"Converting anonymous class instance to string yields string " +
"indiciating that the class is anonymous"
);
@ -183,7 +183,7 @@ var common = require( './common' ),
// named
assert.equal(
named.toString(),
'[object #<' + name + '>]',
'#<' + name + '>',
"Converting named class instance to string yields string with name " +
"of class"
);
@ -214,7 +214,7 @@ var common = require( './common' ),
// was the name set?
assert.equal(
named.toString(),
'[object Class <' + name + '>]',
name,
"Name is set on named clas via staging method"
);
@ -229,7 +229,7 @@ var common = require( './common' ),
assert.equal(
namedi.toString(),
'[object Class <' + name + '>]',
name,
"Name is set on named class via staging method when implementing"
);
} )();