diff options
author | hwc487 | 2012-05-31 17:11:08 -0700 |
---|---|---|
committer | hwc487 | 2012-05-31 17:11:08 -0700 |
commit | 1c445cf5d905f79937998cf2f1115594ea8c1074 (patch) | |
tree | 35271ad7ffec86fde9102af3dd954fa3a2974582 /js/components/ui/input-group.reel | |
parent | 335ce503996e3ccbd2909086328d0a31fbd03370 (diff) | |
parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
download | ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/io/system/ninjalibrary.json
Diffstat (limited to 'js/components/ui/input-group.reel')
-rwxr-xr-x | js/components/ui/input-group.reel/input-group.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html index ba85c089..7da4a855 100755 --- a/js/components/ui/input-group.reel/input-group.html +++ b/js/components/ui/input-group.reel/input-group.html | |||
@@ -25,7 +25,8 @@ | |||
25 | "bindings": { | 25 | "bindings": { |
26 | "data": { | 26 | "data": { |
27 | "boundObject": {"@": "propList"}, | 27 | "boundObject": {"@": "propList"}, |
28 | "boundObjectPropertyPath": "objectAtCurrentIteration" | 28 | "boundObjectPropertyPath": "objectAtCurrentIteration", |
29 | "oneway": true | ||
29 | } | 30 | } |
30 | }, | 31 | }, |
31 | "listeners": [ | 32 | "listeners": [ |