aboutsummaryrefslogtreecommitdiff
path: root/node_modules/tools
diff options
context:
space:
mode:
authorhwc4872012-03-24 14:07:58 -0700
committerhwc4872012-03-24 14:07:58 -0700
commitcca20db1f346fc9bf2ead64c83e479f5f5ebf2d2 (patch)
tree4f5c42f0a1df00dcd1a2064dd176fcff7930ba47 /node_modules/tools
parent62f4327f9b83760e52a1f6bf1e689b1e0a780fbb (diff)
parent7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff)
downloadninja-cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2.tar.gz
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'node_modules/tools')
-rw-r--r--node_modules/tools/template-creator.js20
1 files changed, 12 insertions, 8 deletions
diff --git a/node_modules/tools/template-creator.js b/node_modules/tools/template-creator.js
index 6b50cc1e..e312cd32 100644
--- a/node_modules/tools/template-creator.js
+++ b/node_modules/tools/template-creator.js
@@ -31,18 +31,19 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
31 }, 31 },
32 32
33 initWithHeadAndBodyElements: { 33 initWithHeadAndBodyElements: {
34 value: function(head, body, montageJsPath) { 34 value: function(head, body, components, montageJsPath) {
35 var serializer = this.serializer, 35 var serializer = this.serializer,
36 objects = {}, 36 objects = {},
37 components = {}, 37 //components = {},
38 doc, 38 doc,
39 script, 39 script,
40 self = this; 40 self = this;
41 41
42 this._objectNamesIndex = {}; 42 this._objectNamesIndex = {};
43 doc = this._document = document.implementation.createHTMLDocument(""); 43 //doc = this._document = document.implementation.createHTMLDocument("");
44 44
45 function copyNode(sourceNode, targetNode, isRootNode) { 45 /*
46function copyNode(sourceNode, targetNode, isRootNode) {
46 var childNodes = sourceNode.childNodes, 47 var childNodes = sourceNode.childNodes,
47 childNode, 48 childNode,
48 targetChildNode, 49 targetChildNode,
@@ -54,7 +55,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
54 label = self._generateLabelForComponent(component); 55 label = self._generateLabelForComponent(component);
55 targetNode.setAttribute("id", label); 56 targetNode.setAttribute("id", label);
56 component._element = targetNode; 57 component._element = targetNode;
57 components[label] = component; 58 //components[label] = component;
58 } else { 59 } else {
59 for (var i = 0; (childNode = childNodes[i]); i++) { 60 for (var i = 0; (childNode = childNodes[i]); i++) {
60 targetChildNode = targetNode.appendChild(childNode.cloneNode(false)); 61 targetChildNode = targetNode.appendChild(childNode.cloneNode(false));
@@ -62,8 +63,10 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
62 } 63 }
63 } 64 }
64 } 65 }
66*/
65 67
66 if (head) { 68 /*
69if (head) {
67 doc.head.innerHTML = head.innerHTML; 70 doc.head.innerHTML = head.innerHTML;
68 } 71 }
69 if (montageJsPath) { 72 if (montageJsPath) {
@@ -82,11 +85,12 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
82 // the first child is the title 85 // the first child is the title
83 doc.head.insertBefore(doc.createTextNode("\n "), doc.head.firstChild); 86 doc.head.insertBefore(doc.createTextNode("\n "), doc.head.firstChild);
84 } 87 }
88*/
85 89
86 copyNode(body, this._document.body, true); 90 //copyNode(body, this._document.body, true);
87 this._ownerSerialization = serializer.serialize(components); 91 this._ownerSerialization = serializer.serialize(components);
88 this._externalObjects = serializer.getExternalObjects(); 92 this._externalObjects = serializer.getExternalObjects();
89 93
90 return this; 94 return this;
91 } 95 }
92 }, 96 },