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 <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>
---
 .../ui/picasa-carousel.reel/image.reel/image.html  |   3 +-
 .../ui/picasa-carousel.reel/picasa-carousel.css    |  15 +-
 .../ui/picasa-carousel.reel/picasa-carousel.html   | 242 +++++++++++----------
 .../ui/picasa-carousel.reel/picasa-carousel.js     | 210 +++++++++---------
 4 files changed, 244 insertions(+), 226 deletions(-)

(limited to 'node_modules/montage/ui/picasa-carousel.reel')

diff --git a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
index 3e88adc0..9590fce9 100644
--- a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
@@ -9,8 +9,7 @@
     <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "montage/ui/picasa-carousel.reel/image.reel",
-                "name": "Image",
+                "prototype": "montage/ui/picasa-carousel.reel/image.reel",
                 "properties": {
                     "element": {"#": "Image"}
                 }
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
index 123c4a0f..2494614b 100755
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
@@ -18,7 +18,6 @@
 	display: box;
 	box-pack: center;
 	box-align: center;
-
 }
 
 .montage-google-picasa-carousel .flow {
@@ -28,17 +27,15 @@
             left: 0;
             right: 0;
             bottom: 0;
-*/            -webkit-perspective: 800px;
-            /*background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb));*/
+*/
+    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);
+    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;
-
+    margin: 10% 0;
 }
-    </style>
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
                 }
             }
-
+        }
     }
     </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>
 
     <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel">
-    	<div id="flow" class="flow" style="-webkit-perspective: 1400px; -webkit-transform-style: preserve-3d; width:800px; height:160px; border:1px;">
-	        <img id="image" class="image"/>
-	    </div>
+        <div data-montage-id="flow" class="flow">
+            <img data-montage-id="image" class="image"/>
+        </div>
     </div>
 
 </body>
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
index bdc74c83..0fcbeb2d 100644
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
@@ -15,10 +15,10 @@ var Montage = require("montage").Montage,
  @extends module:montage/ui/component.Component
  */
 var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @lends module:"montage/ui/toggle-switch.reel".ToggleSwitch# */ {
-	    photoListController: {
-	        enumerable: false,
-	        value: null
-	    },
+        photoListController: {
+            enumerable: false,
+            value: null
+        },
 
         flow: {
             value: null
@@ -28,14 +28,12 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
             value: 2300
         },
 
-
-
         _queryParameter: {
             enumerable: false,
             value: null
         },
 
-	    queryParameter: {
+        queryParameter: {
             get: function() {
                 return this._queryParameter;
             },
@@ -43,111 +41,111 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
                 this._queryParameter = value;
                 this.performSearch();
             }
-	    },
-
-	    resultCount: {
-	        enumerable: false,
-	        value: 40
-	    },
-
-	    prepareForDraw: {
-	        enumerable: false,
-	        value: function() {
-	            // this.searchForm.identifier = "searchForm";
-	            // this.searchForm.addEventListener("submit", this, false);
-	        }
-	    },
-
-	    _isSearching: {
-	        value: false,
-	        enumerable: false
-	    },
-
-	    isSearching: {
-	        enumerable: false,
-	        get: function() {
-	            return this._isSearching;
-	        },
-	        set: function(value) {
-	            if (value === this._isSearching) {
-	                return;
-	            }
-
-	            this._isSearching = value;
-	            this.needsDraw = true;
-	        }
-	    },
-
-	    handleSearchFormSubmit: {
-	        value: function(evt) {
-	            evt.preventDefault();
-	            this.performSearch();
-	        }
-	    },
-
-	    performSearch: {
-	        value: function() {
-	            if (this.isSearching) {
-	                console.log("already searching!")
-	                return;
-	            }
-
-	            this.isSearching = true;
-	            this.searchResults = null;
-
-	            var base = "http://picasaweb.google.com/data/feed/base/all?visibility=public&alt=json&max-results=" + this.resultCount + "&kind=photo&prettyprint=true&imgmax=720u&q="
-	//            var base = "http://picasaweb.google.com/data/feed/base/featured?visibility=public&alt=json&max-results=" + this.resultCount + "&kind=photo&prettyprint=true"
-	            var url = base + this.queryParameter;
-
-	            var req = new XMLHttpRequest();
-	            req.identifier = "searchRequest";
-	            req.open("GET", url);
-	            req.addEventListener("load", this, false);
-	            req.addEventListener("error", this, false);
-	            req.send();
-
-	        }
-	    },
-
-	    handleSearchRequestLoad: {
-	        value: function(evt) {
-	            var response = JSON.parse(evt.target.responseText),
-                    previousOrigin = this.flow.origin;
-	            this.searchResults = response.feed.entry;
-                if (this.flow.length === 0) {
+        },
+
+        resultCount: {
+            enumerable: false,
+            value: 1000
+        },
+
+        prepareForDraw: {
+            enumerable: false,
+            value: function() {
+                // this.searchForm.identifier = "searchForm";
+                // this.searchForm.addEventListener("submit", this, false);
+            }
+        },
+
+        _isSearching: {
+            value: false,
+            enumerable: false
+        },
+
+        isSearching: {
+            enumerable: false,
+            get: function() {
+                return this._isSearching;
+            },
+            set: function(value) {
+                if (value === this._isSearching) {
+                    return;
+                }
+
+                this._isSearching = value;
+                this.needsDraw = true;
+            }
+        },
+
+        handleSearchFormSubmit: {
+            value: function(evt) {
+                evt.preventDefault();
+                this.performSearch();
+            }
+        },
+
+        performSearch: {
+            value: function() {
+                if (this.isSearching) {
+                    console.log("already searching!")
+                    return;
+                }
+
+                this.isSearching = true;
+                this.searchResults = null;
+
+                var base = "http://picasaweb.google.com/data/feed/base/all?visibility=public&alt=json&max-results=" + this.resultCount + "&kind=photo&prettyprint=true&imgmax=720u&q="
+    //            var base = "http://picasaweb.google.com/data/feed/base/featured?visibility=public&alt=json&max-results=" + this.resultCount + "&kind=photo&prettyprint=true"
+                var url = base + this.queryParameter;
+
+                var req = new XMLHttpRequest();
+                req.identifier = "searchRequest";
+                req.open("GET", url);
+                req.addEventListener("load", this, false);
+                req.addEventListener("error", this, false);
+                req.send();
+
+            }
+        },
+
+        handleSearchRequestLoad: {
+            value: function(evt) {
+                var response = JSON.parse(evt.target.responseText);
+
+                this.searchResults = response.feed.entry;
+                /*if (this.flow.length === 0) {
                     this.flow.length = this.initialPosition;
                 }
                 if (previousOrigin === 0) {
                     this.flow.origin = this.initialPosition;
                 } else {
                     this.flow.origin = previousOrigin;
+                }*/
+                this.isSearching = false;
+            }
+        },
+
+        handleSearchRequestError: {
+            value: function(evt) {
+                console.error("handleSearchRequestError", evt);
+                this.isSearching = false;
+            }
+        },
+
+        searchResults: {
+            enumerable: false,
+            value: null
+        },
+
+        draw: {
+            value: function() {
+    
+                if (this.isSearching) {
+                    this.element.classList.add("searching");
+                } else {
+                    this.element.classList.remove("searching");
                 }
-	            this.isSearching = false;
-	        }
-	    },
-
-	    handleSearchRequestError: {
-	        value: function(evt) {
-	            console.error("handleSearchRequestError", evt);
-	            this.isSearching = false;
-	        }
-	    },
-
-	    searchResults: {
-	        enumerable: false,
-	        value: null
-	    },
-
-	    draw: {
-	        value: function() {
-
-	            if (this.isSearching) {
-	                this.element.classList.add("searching");
-	            } else {
-	                this.element.classList.remove("searching");
-	            }
-
-	        }
-	    }
+    
+            }
+        }
 
 });
-- 
cgit v1.2.3