Merge branch 'refs/heads/Ninja-Internal' into Color

3 files changed, 4 insertions, 27 deletions

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 f43f9f29..050c0643 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
@@ -9,7 +9,7 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "prototype": "montage-google/picasa-carousel.reel/image.reel",
+                "prototype": "picasa-carousel.reel/image.reel",
                 "properties": {
                     "element": {"#": "Image"}
                 }
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
index bdb1a04f..b60493bf 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
@@ -8,18 +8,6 @@
 .montage-google-picasa-carousel {
     width: 100%;
     height: 100%;
-        /*display: -webkit-box;*/
-        /*-webkit-box-pack: center;*/
-        /*-webkit-box-align: center;*/
-        /*display: -moz-box;*/
-        /*-moz-box-pack: center;*/
-        /*-moz-box-align: center;*/
-        /*display: -ms-box;*/
-        /*-ms-box-pack: center;*/
-        /*-ms-box-align: center;*/
-        /*display: box;*/
-        /*box-pack: center;*/
-        /*box-align: center;*/
         -webkit-transform-style: preserve-3d;
 }
 
@@ -30,12 +18,3 @@
     -webkit-transform-style: preserve-3d;
     -webkit-perspective: 1400px;
 }
-
-.image {
-    position: absolute;
-    -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5);
-}
-
-.montage-google-picasa-carousel .flow .montage-flow-repetition {
-    margin: 10% 0;
-}
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
index 1f2c47d1..8712c228 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
@@ -46,6 +46,8 @@
             "name": "Flow",
             "properties": {
                 "element": {"#": "flow"},
+                "cameraFov": 20,
+                "stride": 1,
                 "paths": [
                     {
                         "knots": [
@@ -105,11 +107,7 @@
                 "elementsBoundingSphereRadius": 700
             },
             "bindings": {
-                "objects": {
-                    "boundObject": {"@": "searchResultsController"},
-                    "boundObjectPropertyPath": "content",
-                    "oneway": true
-                }
+                "objects": {"<-": "@searchResultsController.content"}
             }
         }
     }