diff options
| author | Pushkar Joshi | 2012-06-06 07:54:11 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-06 07:54:11 -0700 |
| commit | cfa1402ac2ce831a83a9d4263d06c452c157a414 (patch) | |
| tree | adb8f1f1ad1c4dd1e7e9eee1bd206f1ec338d20c /js/components/menu/menu-entry.reel | |
| parent | 8606ee7ec851cb0a971e7556eba5d9386f1b3639 (diff) | |
| parent | 5ba54dc275b07e7b2d0ed14751761d1e663d3d14 (diff) | |
| download | ninja-cfa1402ac2ce831a83a9d4263d06c452c157a414.tar.gz | |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/components/menu/menu-entry.reel')
| -rwxr-xr-x | js/components/menu/menu-entry.reel/menu-entry.html | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.html b/js/components/menu/menu-entry.reel/menu-entry.html index cd013a4e..f64de3cb 100755 --- a/js/components/menu/menu-entry.reel/menu-entry.html +++ b/js/components/menu/menu-entry.reel/menu-entry.html | |||
| @@ -17,11 +17,7 @@ | |||
| 17 | "automaticallyOrganizeObjects": false | 17 | "automaticallyOrganizeObjects": false |
| 18 | }, | 18 | }, |
| 19 | "bindings": { | 19 | "bindings": { |
| 20 | "content": { | 20 | "content": {"<-": "@owner.data.entries"} |
| 21 | "boundObject": {"@": "owner"}, | ||
| 22 | "boundObjectPropertyPath": "data.entries", | ||
| 23 | "oneway": true | ||
| 24 | } | ||
| 25 | } | 21 | } |
| 26 | }, | 22 | }, |
| 27 | 23 | ||
| @@ -39,11 +35,8 @@ | |||
| 39 | "element": { "#": "menuEntryItem" } | 35 | "element": { "#": "menuEntryItem" } |
| 40 | }, | 36 | }, |
| 41 | "bindings": { | 37 | "bindings": { |
| 42 | "data": { | 38 | "data": {"<-": "@repetition.objectAtCurrentIteration"}, |
| 43 | "boundObject": {"@": "repetition"}, | 39 | "enabled": {"<-": "@repetition.objectAtCurrentIteration.enabled"} |
| 44 | "boundObjectPropertyPath": "objectAtCurrentIteration", | ||
| 45 | "oneway": true | ||
| 46 | } | ||
| 47 | } | 40 | } |
| 48 | }, | 41 | }, |
| 49 | 42 | ||