diff options
| author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
| commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
| tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/menu/menu-entry.reel/menu-entry.html | |
| parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/menu/menu-entry.reel/menu-entry.html')
| -rwxr-xr-x | js/components/menu/menu-entry.reel/menu-entry.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.html b/js/components/menu/menu-entry.reel/menu-entry.html index f64de3cb..7310545f 100755 --- a/js/components/menu/menu-entry.reel/menu-entry.html +++ b/js/components/menu/menu-entry.reel/menu-entry.html | |||
| @@ -24,8 +24,10 @@ | |||
| 24 | "repetition": { | 24 | "repetition": { |
| 25 | "prototype": "montage/ui/repetition.reel", | 25 | "prototype": "montage/ui/repetition.reel", |
| 26 | "properties": { | 26 | "properties": { |
| 27 | "element": { "#": "subEntries" }, | 27 | "element": { "#": "subEntries" } |
| 28 | "contentController": {"@": "entriesController"} | 28 | }, |
| 29 | "bindings": { | ||
| 30 | "objects": {"<-": "@owner.data.entries"} | ||
| 29 | } | 31 | } |
| 30 | }, | 32 | }, |
| 31 | 33 | ||