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 /node_modules/montage/ui/list.reel/list.html | |
| 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 'node_modules/montage/ui/list.reel/list.html')
| -rwxr-xr-x | node_modules/montage/ui/list.reel/list.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/list.reel/list.html b/node_modules/montage/ui/list.reel/list.html index d3b27e0a..25027bcb 100755 --- a/node_modules/montage/ui/list.reel/list.html +++ b/node_modules/montage/ui/list.reel/list.html | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | } | 17 | } |
| 18 | }, | 18 | }, |
| 19 | "bindings": { | 19 | "bindings": { |
| 20 | "content": {"<-": "@owner.originalContent"}, | 20 | "domContent": {"<-": "@owner.originalContent"}, |
| 21 | "objects": {"<-": "@owner.objects"}, | 21 | "objects": {"<-": "@owner.objects"}, |
| 22 | "contentController": {"<-": "@owner.contentController"}, | 22 | "contentController": {"<-": "@owner.contentController"}, |
| 23 | "isSelectionEnabled": {"<-": "@owner.isSelectionEnabled"} | 23 | "isSelectionEnabled": {"<-": "@owner.isSelectionEnabled"} |