Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

5 files changed, 24 insertions, 7 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index b9c8e797..56f4e3d3 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -106,7 +106,8 @@ exports.HtmlDocument = Montage.create(Component, {
         }
     },
     handleViewReady: {
-        value: function() {
+        value: function(mObjects) {
+            this.model.mObjects = mObjects;
             // TODO: Find a better way to initialize this property
             // Assign the domContainer to be the document root on open
             if(typeof this.model.domContainer !== "undefined") {
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 8ff52132..1daec5c0 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -95,6 +95,19 @@ exports.BaseDocumentModel = Montage.create(Component, {
         libs: {
         value: null
     },
+
+    _mObjects: {
+            value: []
+        },
+
+        mObjects: {
+            get: function() {
+                return this._mObjects;
+            },
+            set: function(value) {
+                this._mObjects = value;
+            }
+        },
     ////////////////////////////////////////////////////////////////////
         //
         switchViewTo: {
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 4a232ee1..d9002b4e 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -68,9 +68,10 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         //
         webGlHelper: {
         value: null
-    },
+    }
     ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
+
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index 8dc05ba5..0da1b87e 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -61,7 +61,7 @@ exports.Main = Montage.create(Component, {
                         var componentRequire = component[data.name];
                         var componentInstance = componentRequire.create();
 
-
+                                                componentInstance.identifier = data.identifier;
                         componentInstance.addEventListener("firstDraw", self, false);
 
                         componentInstance.element = element;
@@ -69,8 +69,6 @@ exports.Main = Montage.create(Component, {
                         componentInstance.ownerComponent = self;
 
                         self.componentToInsert = componentInstance;
-
-
                         callback(componentInstance, element);
                     })
                     .end();
diff --git a/js/document/views/design.js b/js/document/views/design.js
index d5c5c6c4..6a60e1f9 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -461,21 +461,25 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     initMontage: {
         value: function (scripttags) {
             var self = this;
-                //
+
                 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 (){
                                 //TODO: Verify this is properly done, seems like a hack
+
+                    var objArray = [];
                                 for (var c in template._deserializer._objects) {
                                         //Forcing draw on components
                                         template._deserializer._objects[c].needsDraw = true;
+                                                objArray.push(template._deserializer._objects[c]);
                                 }
 
                     // Now call the view callback
                     if(self._viewCallback) {
-                        self._viewCallback.viewCallback.call(self._viewCallback.context);
+                        self._viewCallback.viewCallback.call(self._viewCallback.context, objArray);
                     }
 
                         });