From 792c83a0fe8f7f22d139684ed6d711a2c334c098 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 17 May 2012 16:55:19 -0700
Subject: Adding component initialization on open

This is for opening components, selection is still not reflecting component data.
---
 js/document/views/design.js | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'js/document/views')

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 2ccb82d1..bd8c25ec 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -184,8 +184,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         	this._bodyFragment = null;
         	//Calling standard method to finish opening document
         	this.bodyContentLoaded(null);
-
-            // TODO: Clean up this code
+            //TODO: Move this to be set via the controller
             this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
             this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
     	}
@@ -243,17 +242,15 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 					}
 				}
 			}
-            //Checking and initializing webGL
+           	//Checking for script tags then parsing check for montage and webgl
             if (scripttags.length > 0) {
+            	//Checking and initializing webGL
             	this.initWebGl(scripttags);
-            } //Else there is not data to parse
-    		
-    		
-    		
-    		//TODO: Load Montage Components (blocking)
-    		//this.initMontage();
-    		
-    		
+            	//Checking and initializing Montage
+            	this.initMontage(scripttags);
+            } else {
+            	//Else there is not data to parse
+            }
     		//Makign callback if specified
     		if (this._callback) this._callback();
     	}
@@ -350,8 +347,14 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     ////////////////////////////////////////////////////////////////////
 	//
     initMontage: {
-        value: function () {
-        	//initWithDocument(window.document) instantiateWithOwnerAndDocument(null, window.document)
+        value: function (scripttags) {
+        	//
+        	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*/});
+        	}.bind(this), false);
         }
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From fdfba499f0b84360b96096fa866a981e96e8756c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 18 May 2012 16:35:56 -0700
Subject: fixing the color chip for the document root

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/document/views/design.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'js/document/views')

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 2ccb82d1..44f1a5e8 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -64,6 +64,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     },
     ////////////////////////////////////////////////////////////////////
 	//
+    propertiesPanel: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
 	initialize: {
         value: function (parent) {
         	//Creating iFrame for view
-- 
cgit v1.2.3