- fixed bug, for inheriting from non-joose superclass ("isa" builder …

…was incorrectly inlined)
canonic-epicure · Jun 27, 2011 · 8495422 · 8495422
1 parent 14283c0
commit 8495422
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,8 @@ Release history for JooseX.Namespace.Depended
 
 {{ $NEXT }}
 
+    - fixed bug, for inheriting from non-joose superclass ("isa" builder was incorrectly inlined)
+
 0.16      2011-01-23 12:40
 
     - minor performance improvement - avoid extra `prepareProperties` call, instead call directly to SUPER method

diff --git a/lib/JooseX/Namespace/Depended.js b/lib/JooseX/Namespace/Depended.js
@@ -187,7 +187,7 @@ Role('JooseX.Namespace.Depended', {
                         var descType = typeof descriptor
 
                         if (descType == 'function')
-                            descriptors.push(descriptor.meta ? descriptor : descriptor())
+                            descriptors.push(descriptor.meta ? descriptor : (propName != 'isa' ? descriptor() : null ))
                         else
                             if (descType == 'object')
                                 if (descriptor.token)
@@ -210,7 +210,7 @@ Role('JooseX.Namespace.Depended', {
                         if (descriptors.length > 1) 
                             throw "Cant specify several super- or meta- classes"
                         else
-                            extend[propName] = descriptors[0]
+                            if (descriptors[0]) extend[propName] = descriptors[0]
 
                 }
             })