diff options
author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/components/tools-properties/rect-properties.reel/rect-properties.html | |
parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.html')
-rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.html | 46 |
1 files changed, 40 insertions, 6 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html index 42746caa..a7bf6a7c 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.html +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html | |||
@@ -16,7 +16,17 @@ | |||
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "TLRadiusControl"}, | 17 | "element": {"#": "TLRadiusControl"}, |
18 | "acceptableUnits" : ["px", "pt", "%"] | 18 | "acceptableUnits" : ["px", "pt", "%"] |
19 | } | 19 | }, |
20 | "listeners": [ | ||
21 | { | ||
22 | "type": "change", | ||
23 | "listener": {"@": "owner"} | ||
24 | }, | ||
25 | { | ||
26 | "type": "changing", | ||
27 | "listener": {"@": "owner"} | ||
28 | } | ||
29 | ] | ||
20 | }, | 30 | }, |
21 | 31 | ||
22 | "hottext2": { | 32 | "hottext2": { |
@@ -25,7 +35,13 @@ | |||
25 | "element": {"#": "TRRadiusControl"}, | 35 | "element": {"#": "TRRadiusControl"}, |
26 | "acceptableUnits" : ["px", "pt", "%"], | 36 | "acceptableUnits" : ["px", "pt", "%"], |
27 | "enabled": false | 37 | "enabled": false |
28 | } | 38 | }, |
39 | "listeners": [ | ||
40 | { | ||
41 | "type": "change", | ||
42 | "listener": {"@": "owner"} | ||
43 | } | ||
44 | ] | ||
29 | }, | 45 | }, |
30 | 46 | ||
31 | "hottext3": { | 47 | "hottext3": { |
@@ -34,7 +50,13 @@ | |||
34 | "element": {"#": "BLRadiusControl"}, | 50 | "element": {"#": "BLRadiusControl"}, |
35 | "acceptableUnits" : ["px", "pt", "%"], | 51 | "acceptableUnits" : ["px", "pt", "%"], |
36 | "enabled": false | 52 | "enabled": false |
37 | } | 53 | }, |
54 | "listeners": [ | ||
55 | { | ||
56 | "type": "change", | ||
57 | "listener": {"@": "owner"} | ||
58 | } | ||
59 | ] | ||
38 | }, | 60 | }, |
39 | 61 | ||
40 | "hottext4": { | 62 | "hottext4": { |
@@ -43,7 +65,13 @@ | |||
43 | "element": {"#": "BRRadiusControl"}, | 65 | "element": {"#": "BRRadiusControl"}, |
44 | "acceptableUnits" : ["px", "pt", "%"], | 66 | "acceptableUnits" : ["px", "pt", "%"], |
45 | "enabled": false | 67 | "enabled": false |
46 | } | 68 | }, |
69 | "listeners": [ | ||
70 | { | ||
71 | "type": "change", | ||
72 | "listener": {"@": "owner"} | ||
73 | } | ||
74 | ] | ||
47 | }, | 75 | }, |
48 | 76 | ||
49 | "lockButton": { | 77 | "lockButton": { |
@@ -53,8 +81,14 @@ | |||
53 | "pressed": true, | 81 | "pressed": true, |
54 | "pressedClass": "lockUp", | 82 | "pressedClass": "lockUp", |
55 | "preventFocus": true, | 83 | "preventFocus": true, |
56 | "identifier": "ratio" | 84 | "identifier": "lockButton" |
57 | } | 85 | }, |
86 | "listeners": [ | ||
87 | { | ||
88 | "type": "action", | ||
89 | "listener": {"@": "owner"} | ||
90 | } | ||
91 | ] | ||
58 | }, | 92 | }, |
59 | 93 | ||
60 | "owner": { | 94 | "owner": { |