diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/menu/menu-entry.reel/menu-entry.html | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
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 | ||