diff options
Diffstat (limited to 'js/components/menu')
| -rwxr-xr-x | js/components/menu/menu-item.reel/menu-item.js | 6 | ||||
| -rwxr-xr-x | js/components/menu/menu.reel/menu.html | 20 |
2 files changed, 7 insertions, 19 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js index fc3913b8..9c18ed37 100755 --- a/js/components/menu/menu-item.reel/menu-item.js +++ b/js/components/menu/menu-item.reel/menu-item.js | |||
| @@ -82,7 +82,7 @@ exports.MenuItem = Montage.create(Component, { | |||
| 82 | }); | 82 | }); |
| 83 | 83 | ||
| 84 | } | 84 | } |
| 85 | 85 | /* | |
| 86 | if(this.data.enabled.boundProperty) { | 86 | if(this.data.enabled.boundProperty) { |
| 87 | 87 | ||
| 88 | boundObject = this.application.ninja[this.data.enabled.boundObj]; | 88 | boundObject = this.application.ninja[this.data.enabled.boundObj]; |
| @@ -95,9 +95,11 @@ exports.MenuItem = Montage.create(Component, { | |||
| 95 | }); | 95 | }); |
| 96 | 96 | ||
| 97 | } else { | 97 | } else { |
| 98 | */ | ||
| 98 | this.enabled = this.data.enabled; | 99 | this.enabled = this.data.enabled; |
| 100 | /* | ||
| 99 | } | 101 | } |
| 100 | 102 | */ | |
| 101 | if(this.data.submenu) { | 103 | if(this.data.submenu) { |
| 102 | this.submenu = true; | 104 | this.submenu = true; |
| 103 | 105 | ||
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html index 49956f8a..7f2aeeef 100755 --- a/js/components/menu/menu.reel/menu.html +++ b/js/components/menu/menu.reel/menu.html | |||
| @@ -21,11 +21,7 @@ | |||
| 21 | "automaticallyOrganizeObjects": false | 21 | "automaticallyOrganizeObjects": false |
| 22 | }, | 22 | }, |
| 23 | "bindings": { | 23 | "bindings": { |
| 24 | "content": { | 24 | "content": {"<-": "@menudata.topLevelMenu"} |
| 25 | "boundObject": {"@": "menudata"}, | ||
| 26 | "boundObjectPropertyPath": "topLevelMenu", | ||
| 27 | "oneway": true | ||
| 28 | } | ||
| 29 | } | 25 | } |
| 30 | }, | 26 | }, |
| 31 | 27 | ||
| @@ -44,18 +40,8 @@ | |||
| 44 | "element": { "#": "menuItem" } | 40 | "element": { "#": "menuItem" } |
| 45 | }, | 41 | }, |
| 46 | "bindings": { | 42 | "bindings": { |
| 47 | "data": { | 43 | "data": {"<-": "@repetition.objectAtCurrentIteration"}, |
| 48 | "boundObject": {"@": "repetition"}, | 44 | "_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 | } | 45 | } |
| 60 | }, | 46 | }, |
| 61 | 47 | ||