Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates

2 files changed, 17 insertions, 7 deletions

diff --git a/manifest.json b/manifest.json
index b46c9826..e9406399 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Ninja",
   "description": "Ninja HTML5 Authoring Tool - Alpha Release",
-  "version": "0.5.3.0",
+  "version": "0.6.0.0",
   "app": {
     "launch": {
       "local_path": "index.html"
diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js
index 374353f0..c5d3cffd 100755
--- a/node_modules/tools/template/template-creator.js
+++ b/node_modules/tools/template/template-creator.js
@@ -35,11 +35,13 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             var serializer = this.serializer,
                 objects = {},
                 components = {},
+                componentsChildComponents = {},
                 doc,
                 script,
                 self = this;
             
             this._componentNamesIndex = {};
+            this._objectNamesIndex = {};
             doc = this._document = document.implementation.createHTMLDocument("");
             
             function copyNode(sourceNode, targetNode, isRootNode) {
@@ -51,10 +53,11 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                     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;
+                    componentsChildComponents[label] = component.childComponents;
+                    delete component.childComponents;
                 } else {
                     for (var i = 0; (childNode = childNodes[i]); i++) {
                         targetChildNode = targetNode.appendChild(childNode.cloneNode(false));
@@ -85,6 +88,10 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             
             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;
@@ -94,8 +101,8 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
     _componentNamesIndex: {
         value: null
     },
-    
-    _generateLabelForComponent: {value: function(component) {
+
+    _generateLabelForComponent: {value: function(component, labels) {
         var componentInfo = Montage.getInfoForObject(component),
             componentLabel = componentInfo.label,
             componentName,
@@ -105,8 +112,11 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
             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;
         }
     }},