3 files changed, 47 insertions, 19 deletions

diff --git a/node_modules/montage/core/event/action-event-listener.js b/node_modules/montage/core/event/action-event-listener.js
index bbe5baad..4fc75f64 100755
--- a/node_modules/montage/core/event/action-event-listener.js
+++ b/node_modules/montage/core/event/action-event-listener.js
@@ -66,9 +66,9 @@ var ActionEventListener = exports.ActionEventListener = Montage.create(Montage,
 /**
     @private
 */
-    serializeSelf: {
+    serializeProperties: {
         value: function(serializer) {
-            serializer.setReference("handler", this.handler);
+            serializer.set("handler", this.handler, "reference");
             serializer.set("action", this.action);
         }
     }
diff --git a/node_modules/montage/core/event/binding.js b/node_modules/montage/core/event/binding.js
index 21b40609..709a5d85 100755
--- a/node_modules/montage/core/event/binding.js
+++ b/node_modules/montage/core/event/binding.js
@@ -18,6 +18,7 @@ var Montage = require("montage").Montage,
     ChangeTypes = require("core/event/mutable-event").ChangeTypes,
     Serializer = require("core/serializer").Serializer,
     Deserializer = require("core/deserializer").Deserializer,
+    logger = require("core/logger").logger("binding");
     defaultEventManager = require("core/event/event-manager").defaultEventManager,
     AT_TARGET = 2,
     UNDERSCORE = "_";
@@ -1184,11 +1185,14 @@ var BindingDescriptor = exports.BindingDescriptor = Montage.create(Montage, /**
     },
 
     serializeSelf: {value: function(serializer) {
-        serializer.setReference("boundObject", this.boundObject);
-        serializer.set("boundObjectPropertyPath", this.boundObjectPropertyPath);
-        serializer.set("oneway", this.oneway);
-        serializer.set("deferred", this.deferred);
-        serializer.set("converter", this.converter);
+        var serialization = {};
+
+        serializer.addObjectReference(this.boundObject);
+        serialization[this.oneway ? "<-" : "<<->"] = "@" + serializer.getObjectLabel(this.boundObject) + "." + this.boundObjectPropertyPath;
+        serialization.deferred = this.deferred;
+        serialization.converter = this.converter;
+
+        return serialization;
     }}
 });
 
@@ -1200,10 +1204,36 @@ Serializer.defineSerializationUnit("bindings", function(object) {
     }
 });
 
-Deserializer.defineDeserializationUnit("bindings", function(object, bindings) {
-    var sourcePath;
-    for (sourcePath in bindings) {
-        Object.defineBinding(object, sourcePath, bindings[sourcePath]);
+Deserializer.defineDeserializationUnit("bindings", function(object, bindings, deserializer) {
+    for (var sourcePath in bindings) {
+        var binding = bindings[sourcePath],
+            dotIndex;
+
+        if (!("boundObject" in binding)) {
+            var targetPath = binding["<-"] || binding["->"] || binding["<->>"] || binding["<<->"];
+
+            if (targetPath[0] !== "@") {
+                logger.error("Invalid binding syntax '" + targetPath + "', should be in the form of '@label.path'.");
+                throw "Invalid binding syntax '" + targetPath + "'";
+            }
+            if ("->" in binding || "<->>" in binding) {
+                binding.boundObject = object;
+                binding.boundObjectPropertyPath = sourcePath;
+
+                dotIndex = targetPath.indexOf(".");
+                object = deserializer.getObjectByLabel(targetPath.slice(1, dotIndex));
+                sourcePath = targetPath.slice(dotIndex+1);
+            } else {
+                dotIndex = targetPath.indexOf(".");
+                binding.boundObject = deserializer.getObjectByLabel(targetPath.slice(1, dotIndex));
+                binding.boundObjectPropertyPath = targetPath.slice(dotIndex+1);
+            }
+
+            if ("<-" in binding || "->" in binding) {
+                binding.oneway = true;
+            }
+        }
+        Object.defineBinding(object, sourcePath, binding);
     }
 });
 
diff --git a/node_modules/montage/core/event/event-manager.js b/node_modules/montage/core/event/event-manager.js
index bef8a67c..75272f85 100755
--- a/node_modules/montage/core/event/event-manager.js
+++ b/node_modules/montage/core/event/event-manager.js
@@ -103,13 +103,12 @@ var EventListenerDescriptor = Montage.create(Montage, {
     }
 });
 
-Serializer.defineSerializationUnit("listeners", function(object) {
+Serializer.defineSerializationUnit("listeners", function(object, serializer) {
     var eventManager = defaultEventManager,
         uuid = object.uuid,
         eventListenerDescriptors = [],
         descriptors,
         descriptor,
-        listenerDescriptor,
         listener;
 
     for (var type in eventManager.registeredEventListeners) {
@@ -119,12 +118,11 @@ Serializer.defineSerializationUnit("listeners", function(object) {
             for (var listenerUuid in descriptor.listeners) {
                 listener = descriptor.listeners[listenerUuid];
 
-                eventListenerDescriptor = EventListenerDescriptor.create();
-                eventListenerDescriptor.type = type;
-                eventListenerDescriptor.listener = listener.listener;
-                eventListenerDescriptor.capture = listener.capture;
-
-                eventListenerDescriptors.push(eventListenerDescriptor);
+                eventListenerDescriptors.push({
+                    type: type,
+                    listener: serializer.addObjectReference(listener.listener),
+                    capture: listener.capture
+                });
             }
         }
     }