diff options
| author | Ananya Sen | 2012-06-20 10:40:52 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-20 10:40:52 -0700 |
| commit | 7ebdf28143306c0e3eca08846114179f0e037c1e (patch) | |
| tree | 5cb3529278417fe64705fa71e840046c543575b5 /js/components/menu/menu.reel | |
| parent | 50ee24fdfade83778f623a2e45effca953931a30 (diff) | |
| parent | fcb6309915161d16a74a4385b905742f35b7d62d (diff) | |
| download | ninja-7ebdf28143306c0e3eca08846114179f0e037c1e.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/components/menu/menu-entry.reel/menu-entry.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/menu/menu.reel')
| -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 | ||