diff options
| author | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
| commit | 3f5aa43b5b545cd551c5585ef5f2d478c2d49cad (patch) | |
| tree | fe5beec45a8d7f45a90659e95c4f13a679ae35d5 /js/components/menu/menu.reel/menu.html | |
| parent | 5c4ff40d7950282a179dcfd49c5ea9234e0a8185 (diff) | |
| parent | fcb6309915161d16a74a4385b905742f35b7d62d (diff) | |
| download | ninja-3f5aa43b5b545cd551c5585ef5f2d478c2d49cad.tar.gz | |
Merge branch 'refs/heads/master' into montage-v11-integration
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/menu/menu.reel/menu.html')
| -rwxr-xr-x | js/components/menu/menu.reel/menu.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html index f18c1a0f..98ffa92c 100755 --- a/js/components/menu/menu.reel/menu.html +++ b/js/components/menu/menu.reel/menu.html | |||
| @@ -44,7 +44,8 @@ | |||
| 44 | "element": { "#": "menuItem" } | 44 | "element": { "#": "menuItem" } |
| 45 | }, | 45 | }, |
| 46 | "bindings": { | 46 | "bindings": { |
| 47 | "data": {"<-": "@repetition.objectAtCurrentIteration"} | 47 | "data": {"<-": "@repetition.objectAtCurrentIteration"}, |
| 48 | "menuIsActive": {"<-": "@owner.active"} | ||
| 48 | } | 49 | } |
| 49 | }, | 50 | }, |
| 50 | 51 | ||