diff options
author | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
commit | 8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch) | |
tree | 19a8af74c58c9ea261f0842f36efdab959be3256 /js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | |
parent | eea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff) | |
parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
download | ninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz |
Merge branch 'pentool' into brushtool
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 | } |