1 files changed, 104 insertions, 106 deletions

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;
+    
+            }
+        }