Merge branch 'refs/heads/master' into binding

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Armen Kesablyan <armen@motorola.com>

5 files changed, 29 insertions, 82 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 368bd059..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"}
                 }
@@ -26,7 +26,6 @@
         margin-left: -105px;
         width: 206px;
         height: 140px;
-        border-radius: 4px;
         border: 2px solid #888;
                 background-repeat: no-repeat;
                 background-position: center center;
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 2494614b..b60493bf 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
@@ -3,39 +3,18 @@
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
+
+
 .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;
 }
 
 .montage-google-picasa-carousel .flow {
     width: 100%;
     height: 100%;
-/*            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-*/
-    background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb));
-}
-.image {
-    position: absolute;
-    /*-top: 50%;*/
-    -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5);
-}
 
-.montage-google-picasa-carousel .flow .montage-flow-repetition {
-    margin: 10% 0;
+    -webkit-transform-style: preserve-3d;
+    -webkit-perspective: 1400px;
 }
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 dc70a19c..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": [
@@ -97,65 +99,20 @@
                                 "nextDensity": 3
                             }
                         ],
+                        "headOffset": 9,
+                        "tailOffset": 9,
                         "units": {}
                     }
                 ],
                 "elementsBoundingSphereRadius": 700
             },
             "bindings": {
-                "objects": {
-                    "boundObject": {"@": "searchResultsController"},
-                    "boundObjectPropertyPath": "content",
-                    "oneway": true
-                }
+                "objects": {"<-": "@searchResultsController.content"}
             }
         }
     }
     </script>
 
-    <style>
-        .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;
-        }
-
-        .montage-google-picasa-carousel .flow {
-            width: 100%;
-            height: 100%;
-        /*            top: 0;
-                    left: 0;
-                    right: 0;
-                    bottom: 0;
-        */
-            /*background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb));*/
-            -webkit-transform-style: preserve-3d;
-            -webkit-perspective: 1400px;
-        }
-        .image {
-            position: absolute;
-            /*-top: 50%;*/
-            -webkit-box-shadow: 0 0 35px rgba(0,0,0,.5);
-        }
-
-        .montage-google-picasa-carousel .flow .montage-flow-repetition {
-            margin: 10% 0;
-        }
-
-    </style>
-
 </head>
 <body>
 
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js
index 0b669b80..7e9c64ec 100644
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js
@@ -45,7 +45,7 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
 
         resultCount: {
             enumerable: false,
-            value: 1000
+            value: 500
         },
 
         prepareForDraw: {
diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
index 782318f0..ca08564b 100644
--- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
+++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.js
@@ -10,6 +10,10 @@ var Montage = require("montage").Montage,
 
 var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {
 
+    _savedReference: {
+        value: null
+    },
+
     _userRe: {