diff options
author | Eric Guzman | 2012-02-13 10:30:26 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-13 10:30:26 -0800 |
commit | 672e6f61647b1b8a5f6f5831284fa44bcb7be883 (patch) | |
tree | 0c15656f1f82f194bfcab68634a88f68fd3d42cb /js/components/tools-properties/text-properties.reel/text-properties.html | |
parent | 586c3f7bbea04e62638e5ed8cdce9933e88c0b67 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-672e6f61647b1b8a5f6f5831284fa44bcb7be883.tar.gz |
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rw-r--r-- | js/components/tools-properties/text-properties.reel/text-properties.html | 326 |
1 files changed, 216 insertions, 110 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html index fb57c06d..7ded1236 100644 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -33,8 +33,8 @@ | |||
33 | "alignCenter": {"@": "alignCenter"}, | 33 | "alignCenter": {"@": "alignCenter"}, |
34 | "alignRight": {"@": "alignRight"}, | 34 | "alignRight": {"@": "alignRight"}, |
35 | "alignJustify": {"@": "alignJustify"}, | 35 | "alignJustify": {"@": "alignJustify"}, |
36 | "indentRight": {"@": "indentRight"}, | 36 | "indent": {"@": "indent"}, |
37 | "indentLeft": {"@": "indentLeft"}, | 37 | "outdent": {"@": "outdent"}, |
38 | "numberedList": {"@": "numberedList"}, | 38 | "numberedList": {"@": "numberedList"}, |
39 | "bulletedList": {"@": "bulletedList"} | 39 | "bulletedList": {"@": "bulletedList"} |
40 | } | 40 | } |
@@ -57,8 +57,16 @@ | |||
57 | "module": "js/components/combobox.reel", | 57 | "module": "js/components/combobox.reel", |
58 | "name": "Combobox", | 58 | "name": "Combobox", |
59 | "properties": { | 59 | "properties": { |
60 | "element": {"#": "fontSelection"} | 60 | "element": {"#": "fontSelection"}, |
61 | } | 61 | "identifier": "fontSelection" |
62 | }, | ||
63 | "listeners": [ | ||
64 | { | ||
65 | "type": "change", | ||
66 | "listener": {"@": "owner"} | ||
67 | } | ||
68 | ] | ||
69 | |||
62 | }, | 70 | }, |
63 | "fontSettings": { | 71 | "fontSettings": { |
64 | "module": "js/components/button.reel", | 72 | "module": "js/components/button.reel", |
@@ -69,131 +77,226 @@ | |||
69 | }, | 77 | }, |
70 | 78 | ||
71 | "fontSize": { | 79 | "fontSize": { |
72 | "module": "js/components/hottextunit.reel", | 80 | "module": "js/components/combobox.reel", |
73 | "name": "HotTextUnit", | 81 | "name": "Combobox", |
74 | "properties": { | 82 | "properties": { |
75 | "element": {"#": "fontSize"} | 83 | "element": {"#": "fontSize"}, |
76 | } | 84 | "identifier": "fontSize" |
77 | }, | 85 | }, |
86 | "listeners": [ | ||
87 | { | ||
88 | "type": "change", | ||
89 | "listener": {"@": "owner"} | ||
90 | } | ||
91 | ] | ||
78 | 92 | ||
79 | "fontColor": { | ||
80 | "module": "js/components/button.reel", | ||
81 | "name": "Button", | ||
82 | "properties": { | ||
83 | "element": {"#": "fontColor"} | ||
84 | } | ||
85 | }, | 93 | }, |
94 | |||
86 | "btnBold": { | 95 | "btnBold": { |
87 | "module": "js/components/button.reel", | 96 | "module": "montage/ui/toggle-button.reel", |
88 | "name": "Button", | 97 | "name": "ToggleButton", |
89 | "properties": { | 98 | "properties": { |
90 | "element": {"#": "btnBold"}, | 99 | "element": {"#": "btnBold"}, |
91 | "_isToggleButton": true | 100 | "pressedClass": "active", |
92 | } | 101 | "preventFocus": true, |
102 | "identifier": "btnBold", | ||
103 | "label": "B" | ||
104 | }, | ||
105 | "listeners": [ | ||
106 | { | ||
107 | "type": "action", | ||
108 | "listener": {"@": "owner"} | ||
109 | } | ||
110 | ] | ||
93 | }, | 111 | }, |
94 | "btnItalic": { | 112 | "btnItalic": { |
95 | "module": "js/components/button.reel", | 113 | "module": "montage/ui/toggle-button.reel", |
96 | "name": "Button", | 114 | "name": "ToggleButton", |
97 | "properties": { | 115 | "properties": { |
98 | "element": {"#": "btnItalic"}, | 116 | "element": {"#": "btnItalic"}, |
99 | "_isToggleButton": true | 117 | "pressedClass": "active", |
100 | } | 118 | "preventFocus": true, |
119 | "identifier": "btnItalic", | ||
120 | "label": "I" | ||
121 | }, | ||
122 | "listeners": [ | ||
123 | { | ||
124 | "type": "action", | ||
125 | "listener": {"@": "owner"} | ||
126 | } | ||
127 | ] | ||
101 | }, | 128 | }, |
102 | "btnUnderline": { | 129 | "btnUnderline": { |
103 | "module": "js/components/button.reel", | 130 | "module": "montage/ui/toggle-button.reel", |
104 | "name": "Button", | 131 | "name": "ToggleButton", |
105 | "properties": { | 132 | "properties": { |
106 | "element": {"#": "btnUnderline"}, | 133 | "element": {"#": "btnUnderline"}, |
107 | "_isToggleButton": true | 134 | "pressedClass": "active", |
108 | } | 135 | "preventFocus": true, |
136 | "identifier": "btnUnderline", | ||
137 | "label": "U" | ||
138 | }, | ||
139 | "listeners": [ | ||
140 | { | ||
141 | "type": "action", | ||
142 | "listener": {"@": "owner"} | ||
143 | } | ||
144 | ] | ||
109 | }, | 145 | }, |
110 | "btnStrikethrough": { | 146 | "btnStrikethrough": { |
111 | "module": "js/components/button.reel", | 147 | "module": "montage/ui/toggle-button.reel", |
112 | "name": "Button", | 148 | "name": "ToggleButton", |
113 | "properties": { | 149 | "properties": { |
114 | "element": {"#": "btnStrikethrough"}, | 150 | "element": {"#": "btnStrikethrough"}, |
115 | "_isToggleButton": true | 151 | "pressedClass": "active", |
116 | } | 152 | "preventFocus": true, |
153 | "identifier": "btnStrikethrough", | ||
154 | "label": "S" | ||
155 | }, | ||
156 | "listeners": [ | ||
157 | { | ||
158 | "type": "action", | ||
159 | "listener": {"@": "owner"} | ||
160 | } | ||
161 | ] | ||
117 | }, | 162 | }, |
118 | "txtLink": { | 163 | |
119 | "module": "js/components/textfield.reel", | ||
120 | "name": "TextField", | ||
121 | "properties": { | ||
122 | "element": {"#": "txtLink"} | ||
123 | } | ||
124 | }, | ||
125 | "linkTarget": { | ||
126 | "module": "js/components/combobox.reel", | ||
127 | "name": "Combobox", | ||
128 | "properties": { | ||
129 | "element": {"#": "linkTarget"} | ||
130 | } | ||
131 | }, | ||
132 | |||
133 | "alignLeft": { | 164 | "alignLeft": { |
134 | "module": "js/components/button.reel", | 165 | "module": "montage/ui/toggle-button.reel", |
135 | "name": "Button", | 166 | "name": "ToggleButton", |
136 | "properties": { | 167 | "properties": { |
137 | "element": {"#": "alignLeft"} | 168 | "element": {"#": "alignLeft"}, |
138 | } | 169 | "pressedClass": "active", |
170 | "preventFocus": true, | ||
171 | "identifier": "alignLeft", | ||
172 | "label": "Left" | ||
173 | }, | ||
174 | "listeners": [ | ||
175 | { | ||
176 | "type": "action", | ||
177 | "listener": {"@": "owner"} | ||