- returned to setRawValueTo

canonic-epicure · Oct 8, 2010 · 53a557e · 53a557e
1 parent 1b52e07
commit 53a557e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/lib/KiokuJS/Feature/Attribute/Lazy.js b/lib/KiokuJS/Feature/Attribute/Lazy.js
@@ -43,7 +43,7 @@ Role('KiokuJS.Feature.Attribute.Lazy', {
 
                         scope.lookUp(ID).andThen(function (obj) {
 
-                            me.setValueTo(self, obj)
+                            me.setRawValueTo(self, obj)
 
                             this.CONT.CONTINUE(obj)
                         }, self)
@@ -54,12 +54,6 @@ Role('KiokuJS.Feature.Attribute.Lazy', {
                     this.CONT.CONTINUE(value) 
                 }, self)    
             }
-        },
-
-
-        // XXX somewhat hackish.. seems we still need `getRawValue`
-        getValueFrom : function (instance) {
-            return instance[ this.slot ]
         }
     }
 })
diff --git a/lib/KiokuJS/Test/TypeMap/Person.js b/lib/KiokuJS/Test/TypeMap/Person.js
@@ -24,7 +24,7 @@ Class('KiokuJS.Test.TypeMap.Person', {
 //            
 //            Joose.O.each(instance.meta.getAttributes(), function (attribute, name) {
 //                
-//                data[ name ] = collapser.visit(attribute.getValueFrom(instance))
+//                data[ name ] = collapser.visit(attribute.getRawValueFrom(instance))
 //            })
 //            
 //            return data

diff --git a/lib/KiokuJS/TypeMap/Joose.js b/lib/KiokuJS/TypeMap/Joose.js
@@ -64,7 +64,7 @@ Class('KiokuJS.TypeMap.Joose', {
 
                 if (attribute.hasValue(instance))
                     if (attributeLevel) {
-                        data[ name ] = collapser.visit(attribute.getValueFrom(instance))
+                        data[ name ] = collapser.visit(attribute.getRawValueFrom(instance))
 
                         if (attributeLevel == 2 && attribute.meta.does(KiokuJS.Aspect.AfterCollapse)) attribute.afterCollapse(instance, data[ name ], node, collapser, attribute)
 
@@ -148,7 +148,7 @@ Class('KiokuJS.TypeMap.Joose', {
 
                 if (data.hasOwnProperty(name))
                     if (attributeLevel)
-                        attribute.setValueTo(instance, expander.visit(data[ name ]))
+                        attribute.setRawValueTo(instance, expander.visit(data[ name ]))
                     else
                         // Joose.Proto.Class attributes - just raw values
                         instance[ attribute.name ] = expander.visit(data[ name ])