diff options
author | hwc487 | 2012-06-04 10:21:24 -0700 |
---|---|---|
committer | hwc487 | 2012-06-04 10:21:24 -0700 |
commit | 468b20e7fbc27882f8a37c83afd86d1d06c52afd (patch) | |
tree | 6c2a9c26429c4852961bdabba8f3dad45499be85 /js/components/menu/menu.reel/menu.html | |
parent | 3f5351c5d75080727953caf5d8d9a312c1c9391b (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-468b20e7fbc27882f8a37c83afd86d1d06c52afd.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/menu/menu.reel/menu.html')
-rwxr-xr-x | js/components/menu/menu.reel/menu.html | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html index 49956f8a..f15cf119 100755 --- a/js/components/menu/menu.reel/menu.html +++ b/js/components/menu/menu.reel/menu.html | |||
@@ -12,7 +12,10 @@ | |||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "menudata": { | 14 | "menudata": { |
15 | "prototype": "js/data/menu-data" | 15 | "prototype": "js/data/menu-data", |
16 | "bindings": { | ||
17 | "currentDocument": {"<-": "@owner.currentDocument"} | ||
18 | } | ||
16 | }, | 19 | }, |
17 | 20 | ||
18 | "menuController": { | 21 | "menuController": { |
@@ -21,11 +24,7 @@ | |||
21 | "automaticallyOrganizeObjects": false | 24 | "automaticallyOrganizeObjects": false |
22 | }, | 25 | }, |
23 | "bindings": { | 26 | "bindings": { |
24 | "content": { | 27 | "content": {"<-": "@menudata.topLevelMenu"} |
25 | "boundObject": {"@": "menudata"}, | ||
26 | "boundObjectPropertyPath": "topLevelMenu", | ||
27 | "oneway": true | ||
28 | } | ||
29 | } | 28 | } |
30 | }, | 29 | }, |
31 | 30 | ||
@@ -44,18 +43,8 @@ | |||
44 | "element": { "#": "menuItem" } | 43 | "element": { "#": "menuItem" } |
45 | }, | 44 | }, |
46 | "bindings": { | 45 | "bindings": { |
47 | "data": { | 46 | "data": {"<-": "@repetition.objectAtCurrentIteration"}, |
48 | "boundObject": {"@": "repetition"}, | 47 | "_menu": {"<-": "@repetition.menuComponent"} |
49 | "boundObjectPropertyPath": "objectAtCurrentIteration", | ||
50 | "oneway": true | ||
51 | }, | ||
52 | "_menu": { | ||
53 | "boundObject": {"@": "repetition"}, | ||
54 | "boundObjectPropertyPath": "menuComponent", | ||
55 | "oneway": true | ||
56 | } | ||
57 | |||
58 | |||
59 | } | 48 | } |
60 | }, | 49 | }, |
61 | 50 | ||