From 480c3c43f15162980390cf762411b93f7d02db19 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 9 May 2012 15:40:50 -0700
Subject: fixing the components for the new dom

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/document/models/html.js | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'js/document/models')

diff --git a/js/document/models/html.js b/js/document/models/html.js
index 1639a8e2..2764a6d6 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -26,9 +26,36 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
 	//
 	webGlHelper: {
         value: webGlDocumentHelper
-    }
+    },
 	////////////////////////////////////////////////////////////////////
 	////////////////////////////////////////////////////////////////////
+    userComponents: {
+        value: {}
+    },
+
+    /**
+     * Add a reference to a component instance to the userComponents hash using the
+     * element UUID
+     */
+    setComponentInstance: {
+        value: function(instance, el) {
+            this.userComponents[el.uuid] = instance;
+        }
+    },
+
+    /**
+     * Returns the component instance obj from the element
+     */
+    getComponentFromElement: {
+        value: function(el) {
+            if(el) {
+                if(el.uuid) return this.userComponents[el.uuid];
+            } else {
+                return null;
+            }
+        }
+    }
+
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
-- 
cgit v1.2.3


From 3811f72f8cd8caaa2d13fa695b918f25facb85c5 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 9 May 2012 16:28:13 -0700
Subject: Preliminary Montage Template Cleanup

The template creator is currently not returning serializing code, but does clean the document. Need to investigate reason why, currently all components are removed on save.
---
 js/document/models/html.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'js/document/models')

diff --git a/js/document/models/html.js b/js/document/models/html.js
index 2764a6d6..b57ff832 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -22,30 +22,30 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     draw3DGrid: {
         value: false
     },
+    ////////////////////////////////////////////////////////////////////
+	//
+	baseHref: {
+		value: null
+	},
     ////////////////////////////////////////////////////////////////////
 	//
 	webGlHelper: {
         value: webGlDocumentHelper
     },
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+	//
     userComponents: {
         value: {}
     },
-
-    /**
-     * Add a reference to a component instance to the userComponents hash using the
-     * element UUID
-     */
+	////////////////////////////////////////////////////////////////////
+	//Add a reference to a component instance to the userComponents hash using the element UUID
     setComponentInstance: {
         value: function(instance, el) {
             this.userComponents[el.uuid] = instance;
         }
     },
-
-    /**
-     * Returns the component instance obj from the element
-     */
+    ////////////////////////////////////////////////////////////////////
+	//Returns the component instance obj from the element
     getComponentFromElement: {
         value: function(el) {
             if(el) {
@@ -55,7 +55,8 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
             }
         }
     }
-
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
-- 
cgit v1.2.3