From 2e04af953463643791f6362bd8ef4c6ba190abfa Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 18 Apr 2012 13:48:51 -0700 Subject: Squashed commit of the following: commit 2054551bfb01a0f4ca2e138b9d724835462d45cd Merge: 765c2da 616a853 Author: Valerio Virgillito Date: Wed Apr 18 13:48:21 2012 -0700 Merge branch 'refs/heads/master' into integration commit 765c2da8e1aa03550caf42b2bd5f367555ad2843 Author: Valerio Virgillito Date: Tue Apr 17 15:29:41 2012 -0700 updating the picasa carousel Signed-off-by: Valerio Virgillito commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406 Merge: d27f2df cacb4a2 Author: Valerio Virgillito Date: Tue Apr 17 15:03:50 2012 -0700 Merge branch 'refs/heads/master' into integration commit d27f2df4d846064444263d7832d213535962abe7 Author: Valerio Virgillito Date: Wed Apr 11 10:39:36 2012 -0700 integrating new picasa carousel component Signed-off-by: Valerio Virgillito commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493 Author: Valerio Virgillito Date: Tue Apr 10 14:33:00 2012 -0700 fixed the text area case issue Text area was renamed from TextArea to Textarea Signed-off-by: Valerio Virgillito commit 1e83e26652266136802bc7af930379c1ecd631a6 Author: Valerio Virgillito Date: Mon Apr 9 22:10:45 2012 -0700 integrating montage v0.8 into ninja. Signed-off-by: Valerio Virgillito Signed-off-by: Valerio Virgillito --- .../ui/picasa-carousel.reel/picasa-carousel.html | 242 +++++++++++---------- 1 file changed, 133 insertions(+), 109 deletions(-) (limited to 'node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html') diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html index 34f207b4..8f155d6e 100755 --- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html +++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html @@ -15,130 +15,154 @@ "prototype": "montage/ui/picasa-carousel.reel", "properties": { "element": {"#": "montage-google-picasa-carousel"}, - "searchResultsList": {"@": "searchResultsList"}, - "flow": {"@": "flow1"} + "flow": {"@": "flow"} } - }, - "searchResultsController": { - "module": "montage/ui/controller/array-controller", - "name": "ArrayController", - "bindings": { - "content": { - "boundObject": {"@": "owner"}, - "boundObjectPropertyPath": "searchResults" - } - } - }, - "image1": { - "prototype": "montage/ui/picasa-carousel.reel/image.reel", - "properties": { - "element": {"#": "image"} - }, - "bindings": { - "src": { - "boundObject": {"@": "flow1"}, - "boundObjectPropertyPath": "objectAtCurrentIteration.media$group.media$thumbnail.2.url", - "oneway": true - } - } - }, - "translateComposer1": { - "module": "montage/ui/composer/translate-composer", - "name": "TranslateComposer", - "properties": { - "component": {"@": "flow1"} - }, - "bindings": { - "maxTranslateX": { - "boundObject": {"@": "flow1"}, - "boundObjectPropertyPath": "length", - "oneway": true - }, - "translateX": { - "boundObject": {"@": "flow1"}, - "boundObjectPropertyPath": "origin" - } + }, + "searchResultsController": { + "module": "montage/ui/controller/array-controller", + "name": "ArrayController", + "bindings": { + "content": { + "boundObject": {"@": "owner"}, + "boundObjectPropertyPath": "searchResults" } + } + }, + "image": { + "prototype": "montage/ui/picasa-carousel.reel/image.reel", + "properties": { + "element": {"#": "image"} }, - "nearest": { - "module": "montage/ui/nearest-neighbor-component-search", - "name": "NearestNeighborComponentSearch", - "bindings": { - "componentList": { - "boundObject": {"@": "flow1"}, - "boundObjectPropertyPath": "_repetitionComponents", - "oneway": true - }, - "pointerPosition": { - "boundObject": {"@": "translateComposer1"}, - "boundObjectPropertyPath": "pointerStartEventPosition", - "oneway": true - } + "bindings": { + "src": { + "boundObject": {"@": "flow"}, + "boundObjectPropertyPath": "objectAtCurrentIteration.media$group.media$thumbnail.2.url", + "oneway": true } - }, - "flow1": { - "module": "montage/ui/flow.reel", - "name": "Flow", - "properties": { - "element": {"#": "flow"}, - "cameraRotationAxisX": 1, - "cameraRotationAxisY": 0, - "cameraRotationAxisZ": 0, - "scale": 210 - }, - "bindings": { - "objects": { - "boundObject": {"@": "searchResultsController"}, - "boundObjectPropertyPath": "content", - "oneway": true - }, - "path": { - "boundObject": {"@": "path2"}, - "boundObjectPropertyPath": "path", - "oneway": true - }, - "cameraRotationAngle": { - "boundObject": {"@": "slider3"}, - "boundObjectPropertyPath": "value", - "oneway": true - }, - "selectedSlideIndex": { - "boundObject": {"@": "nearest"}, - "boundObjectPropertyPath": "nearestNeighborComponent", - "oneway": true - }, - "scale": { - "boundObject": {"@": "slider2"}, - "boundObjectPropertyPath": "value", - "oneway": true + } + }, + "flow": { + "module": "montage/ui/flow.reel", + "name": "Flow", + "properties": { + "element": {"#": "flow"}, + "paths": [ + { + "knots": [ + { + "knotPosition": [-1980, 0, 0], + "nextHandlerPosition": [-1760, 0, 0], + "previousDensity": 3, + "nextDensity": 3 + }, + { + "knotPosition": [-1320, 0, 0], + "previousHandlerPosition": [-1540, 0, 0], + "nextHandlerPosition": [-1100, 0, 0], + "previousDensity": 3, + "nextDensity": 3 + }, + { + "knotPosition": [-660, 0, 0], + "previousHandlerPosition": [-880, 0, 0], + "nextHandlerPosition": [-440, 0, 0], + "previousDensity": 3, + "nextDensity": 3 + }, + { + "knotPosition": [0, 0, 350], + "previousHandlerPosition": [-220, 0, 350], + "nextHandlerPosition": [220, 0, 350], + "previousDensity": 3, + "nextDensity": 3 + }, + { + "knotPosition": [660, 0, 0], + "previousHandlerPosition": [440, 0, 0], + "nextHandlerPosition": [880, 0, 0], + "previousDensity": 3, + "nextDensity": 3 + }, + { + "knotPosition": [1320, 0, 0], + "previousHandlerPosition": [1100, 0, 0], + "nextHandlerPosition": [1540, 0, 0], + "previousDensity": 3, + "nextDensity": 3 + }, + { + "knotPosition": [1980, 0, 0], + "previousHandlerPosition": [1760, 0, 0], + "previousDensity": 3, + "nextDensity": 3 + } + ], + "units": {} } - } + ], + "elementsBoundingSphereRadius": 700 }, - "path2": { - "module": "montage/ui/flow-path", - "name": "FlowPath", - "properties": { - "evalPath": [ - "path.translateX = slide.time", - "path.translateY = 0", - "path.translateZ = Math.pow(1.1, -slide.time*slide.time/30000)*600-600", - "path.rotateX = 0", - "path.rotateY = 0", - "path.rotateZ = slide.speed/1500" - ] + "bindings": { + "objects": { + "boundObject": {"@": "searchResultsController"}, + "boundObjectPropertyPath": "content", + "oneway": true } } - + } } + +
-
- -
+
+ +
-- cgit v1.2.3