aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-entry.reel
diff options
context:
space:
mode:
authorhwc4872012-06-04 10:21:24 -0700
committerhwc4872012-06-04 10:21:24 -0700
commit468b20e7fbc27882f8a37c83afd86d1d06c52afd (patch)
tree6c2a9c26429c4852961bdabba8f3dad45499be85 /js/components/menu/menu-entry.reel
parent3f5351c5d75080727953caf5d8d9a312c1c9391b (diff)
parentc1ec69879028220b0c3f11ad6e24035bf527802c (diff)
downloadninja-468b20e7fbc27882f8a37c83afd86d1d06c52afd.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/menu/menu-entry.reel')
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html13
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