aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel/text-properties.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/tools-properties/text-properties.reel/text-properties.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html95
1 files changed, 37 insertions, 58 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 2d50a79e..7fbec1da 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
13 { 13 {
14 14
15 "owner": { 15 "owner": {
16 "module": "js/components/tools-properties/text-properties.reel", 16 "prototype": "js/components/tools-properties/text-properties.reel",
17 "name": "TextProperties",
18 "properties": { 17 "properties": {
19 "element": {"#": "textProperties"}, 18 "element": {"#": "textProperties"},
20 "className": {"@": "className"}, 19 "className": {"@": "className"},
@@ -22,13 +21,10 @@
22 "fontSelection": {"@": "fontSelection"}, 21 "fontSelection": {"@": "fontSelection"},
23 "fontSettings": {"@": "fontSettings"}, 22 "fontSettings": {"@": "fontSettings"},
24 "fontSize": {"@": "fontSize"}, 23 "fontSize": {"@": "fontSize"},
25 "fontColor": {"@": "fontColor"},
26 "btnBold": {"@": "btnBold"}, 24 "btnBold": {"@": "btnBold"},
27 "btnItalic": {"@": "btnItalic"}, 25 "btnItalic": {"@": "btnItalic"},
28 "btnUnderline": {"@": "btnUnderline"}, 26 "btnUnderline": {"@": "btnUnderline"},
29 "btnStrikethrough": {"@": "btnStrikethrough"}, 27 "btnStrikethrough": {"@": "btnStrikethrough"},
30 "txtLink": {"@": "txtLink"},
31 "linkTarget": {"@": "linkTarget"},
32 "alignLeft": {"@": "alignLeft"}, 28 "alignLeft": {"@": "alignLeft"},
33 "alignCenter": {"@": "alignCenter"}, 29 "alignCenter": {"@": "alignCenter"},
34 "alignRight": {"@": "alignRight"}, 30 "alignRight": {"@": "alignRight"},
@@ -40,22 +36,19 @@
40 } 36 }
41 }, 37 },
42 "className": { 38 "className": {
43 "module": "js/components/textfield.reel", 39 "prototype": "js/components/textfield.reel[TextField]",
44 "name": "TextField",
45 "properties": { 40 "properties": {
46 "element": {"#": "className"} 41 "element": {"#": "className"}
47 } 42 }
48 }, 43 },
49 "tagType": { 44 "tagType": {
50 "module": "js/components/combobox.reel", 45 "prototype": "js/components/combobox.reel",
51 "name": "Combobox",
52 "properties": { 46 "properties": {
53 "element": {"#": "tagType"} 47 "element": {"#": "tagType"}
54 } 48 }
55 }, 49 },
56 "fontSelection": { 50 "fontSelection": {
57 "module": "js/components/combobox.reel", 51 "prototype": "js/components/combobox.reel",
58 "name": "Combobox",
59 "properties": { 52 "properties": {
60 "element": {"#": "fontSelection"}, 53 "element": {"#": "fontSelection"},
61 "identifier": "fontSelection" 54 "identifier": "fontSelection"
@@ -69,16 +62,14 @@
69 62
70 }, 63 },
71 "fontSettings": { 64 "fontSettings": {
72 "module": "montage/ui/button.reel", 65 "prototype": "montage/ui/button.reel",
73 "name": "Button",
74 "properties": { 66 "properties": {
75 "element": {"#": "fontSettings"} 67 "element": {"#": "fontSettings"}
76 } 68 }
77 }, 69 },
78 70
79 "fontSize": { 71 "fontSize": {
80 "module": "js/components/combobox.reel", 72 "prototype": "js/components/combobox.reel",
81 "name": "Combobox",
82 "properties": { 73 "properties": {
83 "element": {"#": "fontSize"}, 74 "element": {"#": "fontSize"},
84 "identifier": "fontSize" 75 "identifier": "fontSize"
@@ -93,8 +84,7 @@
93 }, 84 },
94 85
95 "btnBold": { 86 "btnBold": {
96 "module": "montage/ui/toggle-button.reel", 87 "prototype": "montage/ui/toggle-button.reel",
97 "name": "ToggleButton",
98 "properties": { 88 "properties": {
99 "element": {"#": "btnBold"}, 89 "element": {"#": "btnBold"},
100 "pressedClass": "active", 90 "pressedClass": "active",
@@ -111,8 +101,7 @@
111 ] 101 ]
112 }, 102 },
113 "btnItalic": { 103 "btnItalic": {
114 "module": "montage/ui/toggle-button.reel", 104 "prototype": "montage/ui/toggle-button.reel",
115 "name": "ToggleButton",
116 "properties": { 105 "properties": {
117 "element": {"#": "btnItalic"}, 106 "element": {"#": "btnItalic"},
118 "pressedClass": "active", 107 "pressedClass": "active",
@@ -129,8 +118,7 @@
129 ] 118 ]
130 }, 119 },
131 "btnUnderline": { 120 "btnUnderline": {
132 "module": "montage/ui/toggle-button.reel", 121 "prototype": "montage/ui/toggle-button.reel",
133 "name": "ToggleButton",
134 "properties": { 122 "properties": {
135 "element": {"#": "btnUnderline"}, 123 "element": {"#": "btnUnderline"},
136 "pressedClass": "active", 124 "pressedClass": "active",
@@ -147,8 +135,7 @@
147 ] 135 ]
148 }, 136 },
149 "btnStrikethrough": { 137 "btnStrikethrough": {
150 "module": "montage/ui/toggle-button.reel", 138 "prototype": "montage/ui/toggle-button.reel",
151 "name": "ToggleButton",
152 "properties": { 139 "properties": {
153 "element": {"#": "btnStrikethrough"}, 140 "element": {"#": "btnStrikethrough"},
154 "pressedClass": "active", 141 "pressedClass": "active",
@@ -166,8 +153,7 @@
166 }, 153 },
167 154
168 "alignLeft": { 155 "alignLeft": {
169 "module": "montage/ui/toggle-button.reel", 156 "prototype": "montage/ui/toggle-button.reel",
170 "name": "ToggleButton",
171 "properties": { 157 "properties": {
172 "element": {"#": "alignLeft"}, 158 "element": {"#": "alignLeft"},
173 "pressedClass": "active", 159 "pressedClass": "active",
@@ -184,8 +170,7 @@
184 ] 170 ]
185 }, 171 },
186 "alignCenter": { 172 "alignCenter": {
187 "module": "montage/ui/toggle-button.reel", 173 "prototype": "montage/ui/toggle-button.reel",
188 "name": "ToggleButton",
189 "properties": { 174 "properties": {
190 "element": {"#": "alignCenter"}, 175 "element": {"#": "alignCenter"},
191 "pressedClass": "active", 176 "pressedClass": "active",
@@ -202,8 +187,7 @@
202 ] 187 ]
203 }, 188 },
204 "alignRight": { 189 "alignRight": {
205 "module": "montage/ui/toggle-button.reel", 190 "prototype": "montage/ui/toggle-button.reel",
206 "name": "ToggleButton",
207 "properties": { 191 "properties": {
208 "element": {"#": "alignRight"}, 192 "element": {"#": "alignRight"},
209 "pressedClass": "active", 193 "pressedClass": "active",
@@ -220,8 +204,7 @@
220 ] 204 ]
221 }, 205 },
222 "alignJustify": { 206 "alignJustify": {
223 "module": "montage/ui/toggle-button.reel",