diff options
author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/components/ui/input-group.reel/input-group.html | |
parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/ui/input-group.reel/input-group.html')
-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": [ |