diff options
author | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
commit | 2e04af953463643791f6362bd8ef4c6ba190abfa (patch) | |
tree | d07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.js | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz |
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>
Diffstat (limited to 'node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.js')
-rwxr-xr-x | node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.js | 35 |
1 files changed, 0 insertions, 35 deletions
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 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | var Montage = require("montage/core/core").Montage, | ||
7 | Component = require("montage/ui/component").Component; | ||
8 | |||
9 | |||
10 | exports.Main = Montage.create(Component, { | ||
11 | |||
12 | templateDidLoad: { | ||
13 | value: function() { | ||
14 | //console.log("main templateDidLoad") | ||
15 | } | ||
16 | }, | ||
17 | picasaCarousel: { | ||
18 | enumerable: false, | ||
19 | value: null | ||
20 | }, | ||
21 | prepareForDraw: { | ||
22 | enumerable: false, | ||
23 | value: function() { | ||
24 | this.searchForm.identifier = "searchForm"; | ||
25 | this.searchForm.addEventListener("submit", this, false); | ||
26 | } | ||
27 | }, | ||
28 | handleSearchFormSubmit: { | ||
29 | value: function(evt) { | ||
30 | evt.preventDefault(); | ||
31 | this.picasaCarousel.performSearch(); | ||
32 | } | ||
33 | }, | ||
34 | |||
35 | }); | ||