aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel/text-properties.html
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/tools-properties/text-properties.reel/text-properties.html
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts: js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html18
1 files changed, 2 insertions, 16 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 a3477e99..a353752f 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -89,7 +89,6 @@
89 "properties": { 89 "properties": {
90 "element": {"#": "btnBold"}, 90 "element": {"#": "btnBold"},
91 "pressedClass": "active", 91 "pressedClass": "active",
92 "preventFocus": true,
93 "identifier": "btnBold", 92 "identifier": "btnBold",
94 "pressedLabel": "B", 93 "pressedLabel": "B",
95 "unpressedLabel": "B" 94 "unpressedLabel": "B"
@@ -101,7 +100,6 @@
101 "properties": { 100 "properties": {
102 "element": {"#": "btnItalic"}, 101 "element": {"#": "btnItalic"},
103 "pressedClass": "active", 102 "pressedClass": "active",
104 "preventFocus": true,
105 "identifier": "btnItalic", 103 "identifier": "btnItalic",
106 "pressedLabel": "I", 104 "pressedLabel": "I",
107 "unpressedLabel": "I" 105 "unpressedLabel": "I"
@@ -118,7 +116,6 @@
118 "properties": { 116 "properties": {
119 "element": {"#": "btnUnderline"}, 117 "element": {"#": "btnUnderline"},
120 "pressedClass": "active", 118 "pressedClass": "active",
121 "preventFocus": true,
122 "identifier": "btnUnderline", 119 "identifier": "btnUnderline",
123 "pressedLabel": "U", 120 "pressedLabel": "U",
124 "unpressedLabel": "U" 121 "unpressedLabel": "U"
@@ -135,7 +132,6 @@
135 "properties": { 132 "properties": {
136 "element": {"#": "btnStrikethrough"}, 133 "element": {"#": "btnStrikethrough"},
137 "pressedClass": "active", 134 "pressedClass": "active",
138 "preventFocus": true,
139 "identifier": "btnStrikethrough", 135 "identifier": "btnStrikethrough",
140 "pressedLabel": "S", 136 "pressedLabel": "S",
141 "unpressedLabel": "S" 137 "unpressedLabel": "S"
@@ -153,7 +149,6 @@
153 "properties": { 149 "properties": {
154 "element": {"#": "alignLeft"}, 150 "element": {"#": "alignLeft"},
155 "pressedClass": "active", 151 "pressedClass": "active",
156 "preventFocus": true,
157 "identifier": "alignLeft", 152 "identifier": "alignLeft",
158 "pressedLabel": "", 153 "pressedLabel": "",
159 "unpressedLabel": "" 154 "unpressedLabel": ""
@@ -170,7 +165,6 @@
170 "properties": { 165 "properties": {
171 "element": {"#": "alignCenter"}, 166 "element": {"#": "alignCenter"},
172 "pressedClass": "active", 167 "pressedClass": "active",
173 "preventFocus": true,
174 "identifier": "alignCenter", 168 "identifier": "alignCenter",
175 "pressedLabel": "", 169 "pressedLabel": "",
176 "unpressedLabel": "" 170 "unpressedLabel": ""
@@ -187,7 +181,6 @@
187 "properties": { 181 "properties": {
188 "element": {"#": "alignRight"}, 182 "element": {"#": "alignRight"},
189 "pressedClass": "active", 183 "pressedClass": "active",
190 "preventFocus": true,
191 "identifier": "alignRight", 184 "identifier": "alignRight",
192 "pressedLabel": "", 185 "pressedLabel": "",
193 "unpressedLabel": "" 186 "unpressedLabel": ""
@@ -204,7 +197,6 @@
204 "properties": { 197 "properties": {
205 "element": {"#": "alignJustify"}, 198 "element": {"#": "alignJustify"},
206 "pressedClass": "active", 199 "pressedClass": "active",
207 "preventFocus": true,
208 "identifier": "alignJustify", 200 "identifier": "alignJustify",
209 "pressedLabel": "", 201 "pressedLabel": "",
210 "unpressedLabel": "" 202 "unpressedLabel": ""
@@ -220,10 +212,8 @@
220 "prototype": "montage/ui/button.reel", 212 "prototype": "montage/ui/button.reel",
221 "properties": { 213 "properties": {
222 "element": {"#": "indent"}, 214 "element": {"#": "indent"},
223 "pressedClass": "active",
224 "preventFocus": true,
225 "identifier": "indent", 215 "identifier": "indent",
226 "label": ">>" 216 "value": ">>"
227 }, 217 },
228 "listeners": [ 218 "listeners": [
229 { 219 {
@@ -236,10 +226,8 @@
236 "prototype": "montage/ui/button.reel", 226 "prototype": "montage/ui/button.reel",
237 "properties": { 227 "properties": {
238 "element": {"#": "outdent"}, 228 "element": {"#": "outdent"},
239 "pressedClass": "active",
240 "preventFocus": true,
241 "identifier": "outdent", 229 "identifier": "outdent",
242 "label": "<<" 230 "value": "<<"
243 }, 231 },
244 "listeners": [ 232 "listeners": [
245 { 233 {
@@ -253,7 +241,6 @@
253 "properties": { 241 "properties": {
254 "element": {"#": "bulletedList"}, 242 "element": {"#": "bulletedList"},
255 "pressedClass": "active", 243 "pressedClass": "active",
256 "preventFocus": true,
257 "identifier": "bulletedList", 244 "identifier": "bulletedList",
258 "pressedLabel": "• • •", 245 "pressedLabel": "• • •",
259 "unpressedLabel": "• • •" 246 "unpressedLabel": "• • •"
@@ -270,7 +257,6 @@
270 "properties": { 257 "properties": {
271 "element": {"#": "numberedList"}, 258 "element": {"#": "numberedList"},
272 "pressedClass": "active", 259 "pressedClass": "active",
273 "preventFocus": true,
274 "identifier": "numberedList", 260 "identifier": "numberedList",
275 "pressedLabel": "1 2 3", 261 "pressedLabel": "1 2 3",
276 "unpressedLabel": "1 2 3" 262 "unpressedLabel": "1 2 3"