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 Date: Wed Apr 18 13:48:21 2012 -0700 Merge branch 'refs/heads/master' into integration commit 765c2da8e1aa03550caf42b2bd5f367555ad2843 Author: Valerio Virgillito Date: Tue Apr 17 15:29:41 2012 -0700 updating the picasa carousel Signed-off-by: Valerio Virgillito commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406 Merge: d27f2df cacb4a2 Author: Valerio Virgillito Date: Tue Apr 17 15:03:50 2012 -0700 Merge branch 'refs/heads/master' into integration commit d27f2df4d846064444263d7832d213535962abe7 Author: Valerio Virgillito Date: Wed Apr 11 10:39:36 2012 -0700 integrating new picasa carousel component Signed-off-by: Valerio Virgillito commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493 Author: Valerio Virgillito 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 commit 1e83e26652266136802bc7af930379c1ecd631a6 Author: Valerio Virgillito Date: Mon Apr 9 22:10:45 2012 -0700 integrating montage v0.8 into ninja. Signed-off-by: Valerio Virgillito Signed-off-by: Valerio Virgillito --- .../lab/sandbox/ui/picasa-carousel-test/index.html | 77 ---------------------- .../ui/picasa-carousel-test/main.reel/main.css | 7 -- .../ui/picasa-carousel-test/main.reel/main.html | 75 --------------------- .../ui/picasa-carousel-test/main.reel/main.js | 35 ---------- .../sandbox/ui/picasa-carousel-test/package.json | 10 --- 5 files changed, 204 deletions(-) delete mode 100755 node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html delete mode 100755 node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css delete mode 100755 node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html delete mode 100755 node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.js delete mode 100755 node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json (limited to 'node_modules/montage/lab') diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html deleted file mode 100755 index ec34286f..00000000 --- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/index.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - Flow Example - - - - - - - - - -

Bootstrapper

This is the bootstrapper content which will now be shown for at least 1500ms.

Loader

This is the loader content which will now be shown for at least 2000ms.

- - diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css deleted file mode 100755 index 39484e8d..00000000 --- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css +++ /dev/null @@ -1,7 +0,0 @@ -.montage-google-picasa-carousel, [data-montage-id="montage-google-picasa-carousel"] { - height: 300px; - -webkit-perspective: 800px; - background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb)); -} - - diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html deleted file mode 100755 index 4cb48733..00000000 --- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Main Component - - - - - - - - -

Main component of application

- - -

- -

- - - diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.js b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.js deleted file mode 100755 index 3851d82b..00000000 --- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.js +++ /dev/null @@ -1,35 +0,0 @@ -/* - This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. - */ -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component; - - -exports.Main = Montage.create(Component, { - - templateDidLoad: { - value: function() { - //console.log("main templateDidLoad") - } - }, - picasaCarousel: { - enumerable: false, - value: null - }, - prepareForDraw: { - enumerable: false, - value: function() { - this.searchForm.identifier = "searchForm"; - this.searchForm.addEventListener("submit", this, false); - } - }, - handleSearchFormSubmit: { - value: function(evt) { - evt.preventDefault(); - this.picasaCarousel.performSearch(); - } - }, - -}); diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json deleted file mode 100755 index 4dcc16c6..00000000 --- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "loader", - "version": "0.0.0", - "mappings": { - "montage": "../../../../" - }, - "directories": { - "lib": "" - } -} -- cgit v1.2.3