aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Duran2012-07-03 11:56:26 -0700
committerJonathan Duran2012-07-03 11:56:26 -0700
commit0771c013abc4389913ff6cebf1ae6408000d50e6 (patch)
tree1160a274ac8f51aa908b6e5f7f74a2ccbe95d932
parent9cd3ae740b67e192f06ee000eba759ca68bdea52 (diff)
parentfcae5717dab144c4d961b94510aed11d01568345 (diff)
downloadninja-0771c013abc4389913ff6cebf1ae6408000d50e6.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
-rw-r--r--js/io/system/ninjalibrary.json2
-rw-r--r--node_modules/descriptor.json4
-rw-r--r--node_modules/montage-google/picasa-carousel.reel/image.reel/image.html1
-rwxr-xr-xnode_modules/tools/template/template-creator.js3
4 files changed, 7 insertions, 3 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index c5ccbc82..86134b97 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index 9a2177c6..c25354ee 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -215,8 +215,8 @@
215 "montage/ui/bluemoon/slider.reel/slider.css", 215 "montage/ui/bluemoon/slider.reel/slider.css",
216 "montage/ui/bluemoon/slider.reel/slider.html", 216 "montage/ui/bluemoon/slider.reel/slider.html",
217 "montage/ui/bluemoon/slider.reel/slider.js", 217 "montage/ui/bluemoon/slider.reel/slider.js",
218 "montage/ui/bluemoon/tabs.reel/tabs.js", 218 "montage/ui/bluemoon/tabs.reel/tabs.css",
219 "montage/ui/bluemoon/tabs.reel/tabs.js", 219 "montage/ui/bluemoon/tabs.reel/tabs.html",
220 "montage/ui/bluemoon/tabs.reel/tabs.js", 220 "montage/ui/bluemoon/tabs.reel/tabs.js",
221 "montage/ui/bluemoon/textarea.reel/textarea.css", 221 "montage/ui/bluemoon/textarea.reel/textarea.css",
222 "montage/ui/bluemoon/textarea.reel/textarea.html", 222 "montage/ui/bluemoon/textarea.reel/textarea.html",
diff --git a/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html b/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html
index 050c0643..0a0667cf 100644
--- a/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html
+++ b/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html
@@ -30,6 +30,7 @@
30 background-repeat: no-repeat; 30 background-repeat: no-repeat;
31 background-position: center center; 31 background-position: center center;
32 background-size: cover; 32 background-size: cover;
33 opacity: 0.999;
33 } 34 }
34</style> 35</style>
35<body> 36<body>
diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js
index 7cc66093..faf03520 100755
--- a/node_modules/tools/template/template-creator.js
+++ b/node_modules/tools/template/template-creator.js
@@ -36,6 +36,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
36 objects = {}, 36 objects = {},
37 components = {}, 37 components = {},
38 componentsChildComponents = {}, 38 componentsChildComponents = {},
39 componentsElements = {},
39 doc, 40 doc,
40 script, 41 script,
41 self = this; 42 self = this;
@@ -54,6 +55,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
54 55
55 if (component) { 56 if (component) {
56 label = self._generateLabelForComponent(component, Object.keys(components)); 57 label = self._generateLabelForComponent(component, Object.keys(components));
58 componentsElements[label] = component._element;
57 component._element = targetNode; 59 component._element = targetNode;
58 components[label] = component; 60 components[label] = component;
59 componentsChildComponents[label] = component.childComponents; 61 componentsChildComponents[label] = component.childComponents;
@@ -91,6 +93,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
91 this._ownerSerialization = serializer.serialize(components); 93 this._ownerSerialization = serializer.serialize(components);
92 for (var label in components) { 94 for (var label in components) {
93 components[label].childComponents = componentsChildComponents[label]; 95 components[label].childComponents = componentsChildComponents[label];
96 components[label]._element = componentsElements[label];
94 } 97 }
95 components = componentsChildComponents = null; 98 components = componentsChildComponents = null;
96 this._externalObjects = serializer.getExternalObjects(); 99 this._externalObjects = serializer.getExternalObjects();