- passing default superclass to prepareProperties (to allow potential…

… delayed creation)
GunioRobot · Oct 27, 2009 · fe85e77 · fe85e77
1 parent f9e8605
commit fe85e77
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/lib/Joose/Namespace/Manager.js b/lib/Joose/Namespace/Manager.js
@@ -145,7 +145,7 @@ Joose.Namespace.Manager = new Joose.Managed.Class('Joose.Namespace.Manager', {
 //        },
 
 
-        prepareProperties : function (name, props) {
+        prepareProperties : function (name, props, defaultMeta) {
             if (typeof name != 'string') {
                 props = name
                 name = null
@@ -170,7 +170,7 @@ Joose.Namespace.Manager = new Joose.Managed.Class('Joose.Namespace.Manager', {
             var me = this
 
             return function (name, props) {
-                var args = me.prepareProperties(name, props)
+                var args = me.prepareProperties(name, props, metaClass)
 
                 args.meta = args.meta || metaClass
 
@@ -201,24 +201,20 @@ Joose.Namespace.Manager = new Joose.Managed.Class('Joose.Namespace.Manager', {
 
 
         Class : function (name, props) {
-            var args = this.prepareProperties(name, props)
+            var args = this.prepareProperties(name, props, Joose.Meta.Class)
 
             if (!args.meta)
                 if (props && typeof props.isa == 'function')
                     args.meta = props.isa.meta.constructor
                 else
                     args.meta = Joose.Meta.Class
 
-            //to allow delayed meta declaration in nested classes
-            //if not a class
-            if (!args.meta.meta) args.meta = args.meta()
-
             return this.create(args.name, args.meta, args.props)
         },
 
 
         Module : function (name, props) {
-            var args = this.prepareProperties(name, props)
+            var args = this.prepareProperties(name, props, Joose.Namespace.Keeper)
 
             if (typeof args.props == 'function') args.props = { body : args.props }    
 

diff --git a/lib/Task/Joose/Core.js b/lib/Task/Joose/Core.js
@@ -2984,7 +2984,7 @@ Joose.Namespace.Manager = new Joose.Managed.Class('Joose.Namespace.Manager', {
 //        },
 
 
-        prepareProperties : function (name, props) {
+        prepareProperties : function (name, props, defaultMeta) {
             if (typeof name != 'string') {
                 props = name
                 name = null
@@ -3009,7 +3009,7 @@ Joose.Namespace.Manager = new Joose.Managed.Class('Joose.Namespace.Manager', {
             var me = this
 
             return function (name, props) {
-                var args = me.prepareProperties(name, props)
+                var args = me.prepareProperties(name, props, metaClass)
 
                 args.meta = args.meta || metaClass
 
@@ -3040,24 +3040,20 @@ Joose.Namespace.Manager = new Joose.Managed.Class('Joose.Namespace.Manager', {
 
 
         Class : function (name, props) {
-            var args = this.prepareProperties(name, props)
+            var args = this.prepareProperties(name, props, Joose.Meta.Class)
 
             if (!args.meta)
                 if (props && typeof props.isa == 'function')
                     args.meta = props.isa.meta.constructor
                 else
                     args.meta = Joose.Meta.Class
 
-            //to allow delayed meta declaration in nested classes
-            //if not a class
-            if (!args.meta.meta) args.meta = args.meta()
-
             return this.create(args.name, args.meta, args.props)
         },
 
 
         Module : function (name, props) {
-            var args = this.prepareProperties(name, props)
+            var args = this.prepareProperties(name, props, Joose.Namespace.Keeper)
 
             if (typeof args.props == 'function') args.props = { body : args.props }    
 

diff --git a/t/040_my_symbiont.t.js b/t/040_my_symbiont.t.js
@@ -164,7 +164,7 @@ StartTest(function (t) {
 
 
     //==================================================================================================================================================================================
-    t.diag("'my' with custom (and delayed) meta")
+    t.diag("'my' with custom meta")
 
     Class('CustomMeta', {
 
@@ -176,7 +176,7 @@ StartTest(function (t) {
     Class('TestClass3', {
 
         my : {
-            meta : function () { return CustomMeta },
+            meta : CustomMeta,
 
             has : {
                 att3 : 'value3'