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/ui/tabs.reel/tabs.html | |
| 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/ui/tabs.reel/tabs.html')
| -rwxr-xr-x | node_modules/montage/ui/tabs.reel/tabs.html | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/node_modules/montage/ui/tabs.reel/tabs.html b/node_modules/montage/ui/tabs.reel/tabs.html index adb7c9a5..e3e655b2 100755 --- a/node_modules/montage/ui/tabs.reel/tabs.html +++ b/node_modules/montage/ui/tabs.reel/tabs.html | |||
| @@ -8,8 +8,8 @@ | |||
| 8 | <head> | 8 | <head> |
| 9 | <title></title> | 9 | <title></title> |
| 10 | <link rel="stylesheet" type="text/css" href="tabs.css"> | 10 | <link rel="stylesheet" type="text/css" href="tabs.css"> |
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization">{ |
| 12 | { | 12 | |
| 13 | "navController": { | 13 | "navController": { |
| 14 | "name": "ArrayController", | 14 | "name": "ArrayController", |
| 15 | "module": "montage/ui/controller/array-controller", | 15 | "module": "montage/ui/controller/array-controller", |
| @@ -18,11 +18,7 @@ | |||
| 18 | "automaticallyOrganizeObjects": true | 18 | "automaticallyOrganizeObjects": true |
| 19 | }, | 19 | }, |
| 20 | "bindings": { | 20 | "bindings": { |
| 21 | "content": { | 21 | "content": {"<-": "@owner.tabs"} |
| 22 | "boundObject": {"@": "owner"}, | ||
| 23 | "boundObjectPropertyPath": "tabs", | ||
| 24 | "oneway": true | ||
| 25 | } | ||
| 26 | } | 22 | } |
| 27 | }, | 23 | }, |
| 28 | 24 | ||
| @@ -56,15 +52,11 @@ | |||
| 56 | } | 52 | } |
| 57 | }, | 53 | }, |
| 58 | "bindings": { | 54 | "bindings": { |
| 59 | "selectedTabs": { | 55 | "selectedTabs": {"<-": "@navController.selectedObjects"} |
| 60 | "boundObject": {"@": "navController"}, | ||
| 61 | "boundObjectPropertyPath": "selectedObjects", | ||
| 62 | "oneway": true | ||
| 63 | } | ||
| 64 | } | 56 | } |
| 65 | } | 57 | } |
| 66 | } | 58 | |
| 67 | </script> | 59 | }</script> |
| 68 | 60 | ||
| 69 | </head> | 61 | </head> |
| 70 | <body> | 62 | <body> |