diff options
author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
tree | f9540e26c0f273d35f92010605da65dd85bbe70c /js/components/menu/menu.reel | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/components/menu/menu.reel')
-rwxr-xr-x | js/components/menu/menu.reel/menu.html | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html index f15cf119..f18c1a0f 100755 --- a/js/components/menu/menu.reel/menu.html +++ b/js/components/menu/menu.reel/menu.html | |||
@@ -31,9 +31,10 @@ | |||
31 | "repetition": { | 31 | "repetition": { |
32 | "prototype": "montage/ui/repetition.reel", | 32 | "prototype": "montage/ui/repetition.reel", |
33 | "properties": { | 33 | "properties": { |
34 | "element": { "#": "topMenu" }, | 34 | "element": { "#": "topMenu" } |
35 | "contentController": {"@": "menuController"}, | 35 | }, |
36 | "menuComponent": {"@": "owner"} | 36 | "bindings": { |
37 | "objects": {"<-": "@menudata.topLevelMenu"} | ||
37 | } | 38 | } |
38 | }, | 39 | }, |
39 | 40 | ||
@@ -43,17 +44,14 @@ | |||
43 | "element": { "#": "menuItem" } | 44 | "element": { "#": "menuItem" } |
44 | }, | 45 | }, |
45 | "bindings": { | 46 | "bindings": { |
46 | "data": {"<-": "@repetition.objectAtCurrentIteration"}, | 47 | "data": {"<-": "@repetition.objectAtCurrentIteration"} |
47 | "_menu": {"<-": "@repetition.menuComponent"} | ||
48 | } | 48 | } |
49 | }, | 49 | }, |
50 | 50 | ||
51 | "owner": { | 51 | "owner": { |
52 | "prototype": "js/components/menu/menu.reel", | 52 | "prototype": "js/components/menu/menu.reel", |
53 | "properties": { | 53 | "properties": { |
54 | "element": {"#": "mainMenuBar"}, | 54 | "element": {"#": "mainMenuBar"} |
55 | "controller": {"@": "menuController"}, | ||
56 | "rep": {"@": "repetition"} | ||
57 | } | 55 | } |
58 | } | 56 | } |
59 | } | 57 | } |