scoping loadRequest function to entity that it's defined within

danschultz · Apr 25, 2011 · 6aa3651 · 6aa3651
1 parent d9baede
commit 6aa3651
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/mesh/model/associations/Association.as b/src/mesh/model/associations/Association.as
@@ -110,7 +110,7 @@ package mesh.model.associations
 
 			if (!isLoaded) {
 				callback("beforeLoad");
-				_loadRequest = definition.hasLoadRequest ? definition.loadRequest() : createLoadRequest();
+				_loadRequest = definition.hasLoadRequest ? definition.loadRequest.apply(owner) : createLoadRequest();
 				_loadRequest.addHandler({
 					success:function():void
 					{

diff --git a/src/mesh/model/associations/AssociationCollection.as b/src/mesh/model/associations/AssociationCollection.as
@@ -34,7 +34,7 @@ package mesh.model.associations
 			object = [];
 
 			afterLoad(loaded);
-			beforeAdd(populateInverseAssociation);
+			afterAdd(populateInverseAssociation);
 		}
 
 		/**
@@ -204,6 +204,8 @@ package mesh.model.associations
 		{
 			if (definition.hasInverse) {
 				if (entity.hasOwnProperty(definition.inverse)) {
+					// if the inverse relationship is an association, then we populate the inverse 
+					// association's object. otherwise, we just set the property to the association's owner.
 					if (entity[definition.inverse] is Association) {
 						entity[definition.inverse].object = owner;
 					} else {
@@ -370,6 +372,10 @@ package mesh.model.associations
 					value = value.toArray();
 				}
 
+				for each (var entity:Entity in value) {
+					callbackIfNotNull("beforeAdd", entity);
+				}
+
 				super.object = new ArrayCollection(value);
 
 				if (_mirroredEntities == null) {