diff options
| author | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
| commit | 4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch) | |
| tree | c5b17297aba04bd54a59cf6214d29486e089031b /js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | |
| parent | 75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff) | |
| parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
| download | ninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html index bdcbff7f..c3af0668 100755 --- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html +++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | |||
| @@ -22,10 +22,7 @@ | |||
| 22 | "element": { "#": "slotElement" } | 22 | "element": { "#": "slotElement" } |
| 23 | }, | 23 | }, |
| 24 | "bindings": { | 24 | "bindings": { |
| 25 | "content" : { | 25 | "content": {"<-": "@owner.content"} |
| 26 | "boundObject": {"@": "owner"}, | ||
| 27 | "boundObjectPropertyPath": "content" | ||
| 28 | } | ||
| 29 | } | 26 | } |
| 30 | }, | 27 | }, |
| 31 | "slot2": { | 28 | "slot2": { |
| @@ -34,10 +31,7 @@ | |||
| 34 | "element": { "#": "slotElement2" } | 31 | "element": { "#": "slotElement2" } |
| 35 | }, | 32 | }, |
| 36 | "bindings": { | 33 | "bindings": { |
| 37 | "content" : { | 34 | "content": {"<-": "@owner.content2"} |
| 38 | "boundObject": {"@": "owner"}, | ||
| 39 | "boundObjectPropertyPath": "content2" | ||
| 40 | } | ||
| 41 | } | 35 | } |
| 42 | } | 36 | } |
| 43 | } | 37 | } |