aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules')
-rw-r--r--node_modules/descriptor.json9
-rw-r--r--node_modules/tools/template-creator.js12
2 files changed, 11 insertions, 10 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index c460066c..d5bb81f3 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -169,6 +169,7 @@
169 "ui/component.js", 169 "ui/component.js",
170 "ui/composer/composer.js", 170 "ui/composer/composer.js",
171 "ui/composer/long-press-composer.js", 171 "ui/composer/long-press-composer.js",
172 "ui/composer/press-composer.js",
172 "ui/composer/swipe-composer.js", 173 "ui/composer/swipe-composer.js",
173 "ui/composer/translate-composer.js", 174 "ui/composer/translate-composer.js",
174 "ui/condition.reel/condition.js", 175 "ui/condition.reel/condition.js",
@@ -219,21 +220,19 @@
219 "ui/popup/popup.reel/popup.css", 220 "ui/popup/popup.reel/popup.css",
220 "ui/popup/popup.reel/popup.html", 221 "ui/popup/popup.reel/popup.html",
221 "ui/popup/popup.reel/popup.js", 222 "ui/popup/popup.reel/popup.js",
222 "ui/progress.reel/progress.css",
223 "ui/progress.reel/progress.html",
224 "ui/progress.reel/progress.js", 223 "ui/progress.reel/progress.js",
225 "ui/progress.reel/rule.png",
226 "ui/progress.reel/scroll.png",
227 "ui/radio-button.reel/radio-button.js", 224 "ui/radio-button.reel/radio-button.js",
228 "ui/range-input.reel/range-input.js", 225 "ui/range-input.reel/range-input.js",
229 "ui/repetition.reel/repetition.js", 226 "ui/repetition.reel/repetition.js",
230 "ui/scroll-bars.reel/scroll-bars.html", 227 "ui/scroll-bars.reel/scroll-bars.html",
231 "ui/scroll-bars.reel/scroll-bars.js", 228 "ui/scroll-bars.reel/scroll-bars.js",
232 "ui/scroll.js",
233 "ui/scroller.reel/scroller.html", 229 "ui/scroller.reel/scroller.html",
234 "ui/scroller.reel/scroller.js", 230 "ui/scroller.reel/scroller.js",
235 "ui/scrollview.reel/scrollview.js", 231 "ui/scrollview.reel/scrollview.js",
236 "ui/select-input.reel/select-input.js", 232 "ui/select-input.reel/select-input.js",
233 "ui/skeleton/range-input.reel/range-input.css",
234 "ui/skeleton/range-input.reel/range-input.html",
235 "ui/skeleton/range-input.reel/range-input.js",
237 "ui/slot.reel/slot.js", 236 "ui/slot.reel/slot.js",
238 "ui/substitution.reel/substitution.js", 237 "ui/substitution.reel/substitution.js",
239 "ui/tabs.reel/tabs.css", 238 "ui/tabs.reel/tabs.css",
diff --git a/node_modules/tools/template-creator.js b/node_modules/tools/template-creator.js
index 6b50cc1e..ba4cdc7a 100644
--- a/node_modules/tools/template-creator.js
+++ b/node_modules/tools/template-creator.js
@@ -31,10 +31,10 @@ 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;
@@ -42,7 +42,8 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
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,6 +63,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
62 } 63 }
63 } 64 }
64 } 65 }
66*/
65 67
66 if (head) { 68 if (head) {
67 doc.head.innerHTML = head.innerHTML; 69 doc.head.innerHTML = head.innerHTML;
@@ -83,7 +85,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
83 doc.head.insertBefore(doc.createTextNode("\n "), doc.head.firstChild); 85 doc.head.insertBefore(doc.createTextNode("\n "), doc.head.firstChild);
84 } 86 }
85 87
86 copyNode(body, this._document.body, true); 88 //copyNode(body, this._document.body, true);
87 this._ownerSerialization = serializer.serialize(components); 89 this._ownerSerialization = serializer.serialize(components);
88 this._externalObjects = serializer.getExternalObjects(); 90 this._externalObjects = serializer.getExternalObjects();
89 91