Reworked component watcher a bit, still somewhat flaky, fixed

changeresponder to deal with syncing responses from XMLHTTServiceProvider a bit better.
rbgrouleff · Feb 10, 2009 · e567e40 · e567e40
1 parent 02070e2
commit e567e40
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/framework/src/org/restfulx/components/rx/ComponentWatcher.as b/framework/src/org/restfulx/components/rx/ComponentWatcher.as
@@ -71,7 +71,6 @@ package org.restfulx.components.rx {
      */
     public function set model(value:Object):void {
       _model = value;
-      updateBinding();
     }
 
     /**
@@ -88,7 +87,6 @@ package org.restfulx.components.rx {
      */
     public function set field(value:String):void {
       _field = value;
-      updateBinding();
     }
 
     /**
@@ -138,8 +136,7 @@ package org.restfulx.components.rx {
     private function updateBinding():void {
       if (bound) clearBinding();
 
-      if (model != null &&  model.hasOwnProperty(field)
-        && target != null && target.hasOwnProperty(property)) {
+      if (target && target.hasOwnProperty(property)) {
         componentWatcher = ChangeWatcher.watch(target, property, onChange, true);
         bound = true;
       }
@@ -155,7 +152,7 @@ package org.restfulx.components.rx {
     }
 
     private function onChange(event:Event):void {
-      if (model[field] != event.target[property]) {
+      if (model && model.hasOwnProperty(field) && model[field] != event.target[property]) {
         model[field] = event.target[property];
         model["dirty"] = true;
       }

diff --git a/framework/src/org/restfulx/components/rx/RxAutoComplete.as b/framework/src/org/restfulx/components/rx/RxAutoComplete.as
@@ -273,7 +273,7 @@ package org.restfulx.components.rx {
     }
 
     private function onResourceShow(result:Object):void {
-      //selectedItem = result;
+      selectedItem = result;
       preselectedItem = false;
       preselectedObject = null;
       if (clearTextAfterFind) clearTypedText();

diff --git a/framework/src/org/restfulx/models/RxModel.as b/framework/src/org/restfulx/models/RxModel.as
@@ -46,6 +46,9 @@ package org.restfulx.models {
 
     /** can be used to see if this model's properties have been changed */
     public var dirty:Boolean;
+
+    /** indicates if this is a clone */
+    public var cloned:Boolean;
 
     /** any model can have one attachment, this can be either RxFileRefrence or BinaryAttachment */
     public var attachment:Object;

diff --git a/framework/src/org/restfulx/services/ChangeResponder.as b/framework/src/org/restfulx/services/ChangeResponder.as
@@ -74,6 +74,9 @@ package org.restfulx.services {
       if (!destination.hasErrors(event.result)) {
         controller.count--;
         var target:Object = destination.unmarshall(event.result, true);
+        if (RxUtils.isEmpty(target["rev"])) {
+          target["rev"] = 0;
+        }
         target["xrev"] = item["rev"];
         switch (action) {
           case ChangeController.CREATE :

diff --git a/framework/src/org/restfulx/utils/RxUtils.as b/framework/src/org/restfulx/utils/RxUtils.as
@@ -58,6 +58,7 @@ package org.restfulx.utils {
       "xrev",
       "sync",
       "dirty",
+      "cloned",
       "attachment",
       "prototype"
     ];
@@ -92,11 +93,15 @@ package org.restfulx.utils {
 
     /**
      * If the object cloned is a RxModel do clone based on reflection, else
-     * default to binary ObjectUtil clone.
+     * default to binary ObjectUtil clone. Recursive cloning can be very slow
+     * and should be avoided for large trees.
      *  
      * @param object object to clone
+     * @param recursive indicates if references RxModels should be cloned too
+     * 
+     * @return cloned RxModel instance
      */
-    public static function clone(object:Object):Object {
+    public static function clone(object:Object, recursive:Boolean = false):Object {
       if (object is RxModel) {
         var fqn:String = getQualifiedClassName(object);
         var clazz:Class = getDefinitionByName(fqn) as Class;
@@ -105,11 +110,16 @@ package org.restfulx.utils {
         cloned["rev"] = object["rev"];
         cloned["xrev"] = object["xrev"];
         cloned["sync"] = object["sync"];
+        cloned["cloned"] = true;
         for each (var node:XML in describeType(object)..accessor) {
           if (!isInvalidPropertyName(node.@name)) {
             try {
               var name:String = node.@name;
-              cloned[name] = object[name];
+              if (recursive && object[name] is RxModel && object[name] != null && !object[name]["cloned"]) {
+                cloned[name] = clone(object[name]);
+              } else {
+                cloned[name] = object[name];
+              }
             } catch (e:Error) {
               // we can fail cloning if the property is read-only, etc.
             }