From 5497e1d7776b8fd90d55ef5614c97e87a2e34d34 Mon Sep 17 00:00:00 2001 From: António Afonso Date: Tue, 3 Jul 2012 11:04:29 -0700 Subject: gh-329 Make Template Creator restore the elements after serialization To create the serialization the element of each component needs to point to a new one, since the code was not restoring these elements the components were left in an undefined state.--- node_modules/tools/template/template-creator.js | 3 +++ 1 file changed, 3 insertions(+) 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 objects = {}, components = {}, componentsChildComponents = {}, + componentsElements = {}, doc, script, self = this; @@ -54,6 +55,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le if (component) { label = self._generateLabelForComponent(component, Object.keys(components)); + componentsElements[label] = component._element; component._element = targetNode; components[label] = component; componentsChildComponents[label] = component.childComponents; @@ -91,6 +93,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le this._ownerSerialization = serializer.serialize(components); for (var label in components) { components[label].childComponents = componentsChildComponents[label]; + components[label]._element = componentsElements[label]; } components = componentsChildComponents = null; this._externalObjects = serializer.getExternalObjects(); -- cgit v1.2.3 From fcae5717dab144c4d961b94510aed11d01568345 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 3 Jul 2012 11:37:16 -0700 Subject: adding missing montage to the user library and temporary fix for picas screen trash Signed-off-by: Valerio Virgillito --- js/io/system/ninjalibrary.json | 2 +- node_modules/descriptor.json | 4 ++-- .../montage-google/picasa-carousel.reel/image.reel/image.html | 1 + 3 files changed, 4 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 @@ { "libraries": [ - {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"}, + {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.0"}, {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} ] } \ 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 @@ "montage/ui/bluemoon/slider.reel/slider.css", "montage/ui/bluemoon/slider.reel/slider.html", "montage/ui/bluemoon/slider.reel/slider.js", - "montage/ui/bluemoon/tabs.reel/tabs.js", - "montage/ui/bluemoon/tabs.reel/tabs.js", + "montage/ui/bluemoon/tabs.reel/tabs.css", + "montage/ui/bluemoon/tabs.reel/tabs.html", "montage/ui/bluemoon/tabs.reel/tabs.js", "montage/ui/bluemoon/textarea.reel/textarea.css", "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 @@ background-repeat: no-repeat; background-position: center center; background-size: cover; + opacity: 0.999; } -- cgit v1.2.3