Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/properties.reel/properties.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

2 files changed, 46 insertions, 26 deletions

diff --git a/node_modules/tools/package.json b/node_modules/tools/package.json
new file mode 100755
index 00000000..5d830af3
--- /dev/null
+++ b/node_modules/tools/package.json
@@ -0,0 +1,14 @@
+
+{
+    "name": "tools",
+    "version": "0.1.0",
+    "description": "Montage Tools",
+    "main": "tools",
+    "mappings": {
+        "montage" : "../montage/"
+    },
+    "dependency": {
+        "montage" : "0.8"
+    }
+
+}
\ No newline at end of file
diff --git a/node_modules/tools/template-creator.js b/node_modules/tools/template/template-creator.js
index e312cd32..c5d3cffd 100644..100755
--- a/node_modules/tools/template-creator.js
+++ b/node_modules/tools/template/template-creator.js
@@ -23,39 +23,41 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             return this.initWithHeadAndBodyElements(doc.head, doc.body, montageJsPath);
         }
     },
-
+    
     initWithBodyElement: {
         value: function(body, montageJsPath) {
             return this.initWithHeadAndBodyElements(null, body, montageJsPath);
         }
     },
-
+    
     initWithHeadAndBodyElements: {
-        value: function(head, body, components, montageJsPath) {
+        value: function(head, body, montageJsPath) {
             var serializer = this.serializer,
                 objects = {},
-                //components = {},
+                components = {},
+                componentsChildComponents = {},
                 doc,
                 script,
                 self = this;
-
+            
+            this._componentNamesIndex = {};
             this._objectNamesIndex = {};
-            //doc = this._document = document.implementation.createHTMLDocument("");
-
-            /*
-function copyNode(sourceNode, targetNode, isRootNode) {
+            doc = this._document = document.implementation.createHTMLDocument("");
+            
+            function copyNode(sourceNode, targetNode, isRootNode) {
                 var childNodes = sourceNode.childNodes,
                     childNode,
                     targetChildNode,
                     label,
                     script,
                     component = isRootNode ? null : sourceNode.controller;
-
+                    
                 if (component) {
-                    label = self._generateLabelForComponent(component);
-                    targetNode.setAttribute("id", label);
+                    label = self._generateLabelForComponent(component, Object.keys(components));
                     component._element = targetNode;
-                    //components[label] = component;
+                    components[label] = component;
+                    componentsChildComponents[label] = component.childComponents;
+                    delete component.childComponents;
                 } else {
                     for (var i = 0; (childNode = childNodes[i]); i++) {
                         targetChildNode = targetNode.appendChild(childNode.cloneNode(false));
@@ -63,10 +65,8 @@ function copyNode(sourceNode, targetNode, isRootNode) {
                     }
                 }
             }
-*/
-
-            /*
-if (head) {
+            
+            if (head) {
                 doc.head.innerHTML = head.innerHTML;
             }
             if (montageJsPath) {
@@ -75,7 +75,7 @@ if (head) {
                doc.head.appendChild(script);
                doc.head.insertBefore(doc.createTextNode("\n    "), script);
             }
-
+            
             // try to make things look nice...
             var html = doc.documentElement;
             html.insertBefore(doc.createTextNode("\n"), doc.head);
@@ -85,21 +85,24 @@ if (head) {
                 // the first child is the title
                 doc.head.insertBefore(doc.createTextNode("\n    "), doc.head.firstChild);
             }
-*/
-
-            //copyNode(body, this._document.body, true);
+            
+            copyNode(body, this._document.body, true);
             this._ownerSerialization = serializer.serialize(components);
+            for (var label in components) {
+                components[label].childComponents = componentsChildComponents[label];
+            }
+            components = componentsChildComponents = null;
             this._externalObjects = serializer.getExternalObjects();
-                        
+            
             return this;
         }
     },
-
+    
     _componentNamesIndex: {
         value: null
     },
 
-    _generateLabelForComponent: {value: function(component) {
+    _generateLabelForComponent: {value: function(component, labels) {
         var componentInfo = Montage.getInfoForObject(component),
             componentLabel = componentInfo.label,
             componentName,
@@ -109,8 +112,11 @@ if (head) {
             return componentLabel;
         } else {
             componentName = componentInfo.objectName.toLowerCase();
-            index = this._componentNamesIndex[componentName] || 1;
-            this._componentNamesIndex[componentName] = index + 1;
+            do {
+                index = this._componentNamesIndex[componentName] || 1;
+                this._componentNamesIndex[componentName] = index + 1;
+            } while (labels.indexOf(componentName+index) >= 0);
+
             return componentName + index;
         }
     }},