14 files changed, 271 insertions, 56 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 543aa96f..cd0139a0 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -8,46 +8,126 @@ var Montage = require("montage/core/core").Montage,
     Component        = require("montage/ui/component").Component;
 
 var objectsController = exports.ObjectsController = Montage.create(Component, {
+
+    _currentDocument : {
+        value : null,
+        enumerable : false
+    },
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(doc) {
+            if(!doc) { return false; }
+
+            // TODO: remove setTimeout when timing of montage initialization is done
+            setTimeout(function() {
+                this.bindToModelObjects();
+            }.bind(this), 1000);
+
+            this._currentDocument = doc;
+        },
+        enumerable : false
+    },
+
     objects : {
         value: []
     },
 
-    handleAppLoaded : {
+    _isBoundToModelObjects : {
+        value: null
+    },
+    bindToModelObjects : {
         value: function() {
-            ///// Bind app's activeDocument property to
-            ///// objects controller's _activeDocument property
+            //// Remove any previous bindings if previously bound
+            if(!this._isBoundToModelObjects) {
+                Object.deleteBinding(this, 'objects');
+                this._isBoundToModelObjects = true;
+            }
+
+            Object.defineBinding(this, 'objects', {
+                boundObject: this.currentDocument.model,
+                boundObjectPropertyPath: 'objects',
+                oneway: false
+            });
         }
     },
+    
+    /* --------------------------
+          Binding Methods
+    ----------------------------- */
+    
+    addBinding : {
+        value: function(bindingArgs) {
+            if(!bindingArgs.sourceObject || !bindingArgs.sourceObjectPropertyPath || !bindingArgs) { return; }
 
-    deserializedFromTemplate : {
-        value: function() {
-            this.eventManager.addEventListener( "appLoaded", this, false);
-        },
-        enumerable : false
+            Object.defineBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath, bindingArgs);
+        }
     },
 
-    _activeDocument : {
-        value : null,
-        enumerable : false
+    removeBinding : {
+        value: function(bindingArgs) {
+            if(!bindingArgs) { return; }
+
+            Object.deleteBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath);
+        }
     },
 
-    activeDocument : {
-        get : function() {
-            return this._activeDocument;
-        },
-        set : function(document) {
-            ///// If the document is null set default stylesheets to null
-            if(!document) { return false; }
+    editBindingPropertyPath : {
+        value: function(bindingArgs, newPropertyPath) {
+            this.removeBinding(bindingArgs);
 
-            setTimeout(function() {
-                this.objects = document._document.application._template._deserializer.getObjectsFromLastDeserialization();
-            }.bind(this), 1000);
+            bindingArgs.boundObjectPropertyPath = 'newPropertyPath';
+
+            this.addBinding(bindingArgs);
+        }
+    },
+    
+    getObjectBindings : {
+        value: function(object) {
+            var descriptors = object._bindingDescriptors,
+                bindingsArray = [],
+                property, descriptor, bindingArgsObject;
+
+            for(property in descriptors) {
+                if(descriptors.hasOwnProperty(property)) {
+                    descriptor = descriptors[property];
+
+                    bindingArgsObject = {
+                        sourceObject : object,
+                        sourceObjectPropertyPath : property,
+                        boundObject : descriptor.boundObject,
+                        boundObjectPropertyPath : descriptor.boundObjectPropertyPath,
+                        onweway : descriptor.oneway
+                    };
 
+                    bindingsArray.push(bindingArgsObject);
+                }
+            }
 
-            ///// setting document via binding
-            this._activeDocument = document;
+            return bindingsArray;
+        }
+    },
+
+    /* ---- Bindable controller properties ---- */
+
+    currentObjectBindings : {
+        value: null
+    },
+    _currentObject : {
+        value: null
+    },
+    currentObject : {
+        get: function() {
+            return this._currentObject;
         },
-        enumerable : false
+        set: function(value) {
+            if(value === this._currentObject) { return; }
+
+            this.currentObjectBindings = this.getObjectBindings(value);
+
+            this._currentObject = value;
+        }
     }
 
 });
\ No newline at end of file
diff --git a/js/document/models/html.js b/js/document/models/html.js
index fd42d4de..a93faa9e 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -74,6 +74,7 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     setComponentInstance: {
         value: function(instance, el) {
             this.userComponents[el.uuid] = instance;
+            this.objects.push(instance);
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -86,6 +87,10 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
                 return null;
             }
         }
+    },
+    ////////////////////////////////////////////////////////////////////
+    objects : {
+        value: null
     }
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index a406abdb..91c46fda 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -29,6 +29,7 @@ exports.Main = Montage.create(Component, {
                         var componentRequire = component[data.name];
                         var componentInstance = componentRequire.create();
 
+                        componentInstance._montage_metadata.label = data.name;
                         componentInstance.element = element;
 
                         componentInstance.needsDraw = true;
diff --git a/js/document/views/design.js b/js/document/views/design.js
index c7313708..947ad196 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -395,11 +395,15 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     initMontage: {
         value: function (scripttags) {
                 //
+            //debugger;
                 this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () {
                         //Initializing template with user's seriliazation
                         var template = this.iframe.contentWindow.mjsTemplate.create();
+
                         template.initWithDocument(this.iframe.contentWindow.document);
-                        template.instantiateWithOwnerAndDocument(null, this.iframe.contentWindow.document, function (e){/*Nothing just a required extra parameter*/});
+                        template.instantiateWithOwnerAndDocument(null, this.iframe.contentWindow.document, function (e){
+                    this.model.objects = template.deserializer.getObjectsFromLastDeserialization();
+                }.bind(this));
                 }.bind(this), false);
         }