Squashed commit of the following:

commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 18 13:48:21 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:29:41 2012 -0700

    updating the picasa carousel

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:03:50 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 11 10:39:36 2012 -0700

    integrating new picasa carousel component

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
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 <valerio@motorola.com>

commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Mon Apr 9 22:10:45 2012 -0700

    integrating montage v0.8 into ninja.

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 38 insertions, 10 deletions

diff --git a/node_modules/montage/ui/flow.reel/flow.html b/node_modules/montage/ui/flow.reel/flow.html
index 646c87f8..8a9603bf 100644
--- a/node_modules/montage/ui/flow.reel/flow.html
+++ b/node_modules/montage/ui/flow.reel/flow.html
@@ -9,24 +9,43 @@
     <title></title>
     <script type="text/montage-serialization">
         {
-            "repetition1": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+            "repetition": {
+                "prototype": "montage/ui/repetition.reel",
                 "properties": {
                     "element": {
                         "#": "montage-flow-repetition"
                     }
                 }
             },
+            "translateComposer": {
+                "prototype": "montage/ui/composer/translate-composer",
+                "properties": {
+                    "component": {"@": "owner"},
+                    "maxTranslateX": 250000,
+                    "invertAxis": true
+                },
+                "bindings": {
+                    "element": {"<-": "@owner._element"}
+                }
+            },
             "owner": {
-                "module": "montage/ui/flow.reel",
-                "name": "Flow",
+                "prototype": "montage/ui/flow.reel",
                 "properties": {
                     "element": {
                         "#": "montage-flow"
                     },
                     "_repetition": {
-                        "@": "repetition1"
+                        "@": "repetition"
+                    },
+                    "_translateComposer": {
+                        "@": "translateComposer"
+                    }
+                },
+                "bindings": {
+                    "translateX": {"<-": "@translateComposer.translateX"},
+                    "isSelectionEnabled": {
+                        "boundObject": {"@": "repetition"},
+                        "boundObjectPropertyPath": "isSelectionEnabled"
                     }
                 }
             }
@@ -47,14 +66,23 @@
             -webkit-transform-style: preserve-3d;
             -webkit-transform: translateZ(0);
         }
-        .montage-flow-repetition > * {
-            position: absolute !important;
+        .montage-flow-repetition > div {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            width: 0;
+            height: 0;
+            -webkit-transform: translateZ(0);
+            -webkit-transform-style: preserve-3d;
+        }
+        .montage-flow-pointer-events-none {
+            pointer-events: none;
         }
     </style>
 </head>
 <body>
-    <div id="montage-flow" class="montage-flow">
-        <div id="montage-flow-repetition" class="montage-flow-repetition"></div>
+    <div data-montage-id="montage-flow" class="montage-flow">
+        <div data-montage-id="montage-flow-repetition" class="montage-flow-repetition"></div>
     </div>
 </body>
 </html>