aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel/text-properties.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /js/components/tools-properties/text-properties.reel/text-properties.html
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rwxr-xr-x[-rw-r--r--]js/components/tools-properties/text-properties.reel/text-properties.html338
1 files changed, 227 insertions, 111 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..13a88ba7 100644..100755
--- 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,236 @@
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 "pressedLabel": "B",
104 "unpressedLabel": "B"
105 },
106 "listeners": [
107 {
108 "type": "action",
109 "listener": {"@": "owner"}
110 }
111 ]
93 }, 112 },
94 "btnItalic": { 113 "btnItalic": {
95 "module": "js/components/button.reel", 114 "module": "montage/ui/toggle-button.reel",
96 "name": "Button", 115 "name": "ToggleButton",
97 "properties": { 116 "properties": {
98 "element": {"#": "btnItalic"}, 117 "element": {"#": "btnItalic"},
99 "_isToggleButton": true 118 "pressedClass": "active",
100 } 119 "preventFocus": true,
120 "identifier": "btnItalic",
121 "pressedLabel": "I",
122 "unpressedLabel": "I"
123 },
124 "listeners": [
125 {
126 "type": "action",
127 "listener": {"@": "owner"}
128 }
129 ]
101 }, 130 },
102 "btnUnderline": { 131 "btnUnderline": {
103 "module": "js/components/button.reel", 132 "module": "montage/ui/toggle-button.reel",
104 "name": "Button", 133 "name": "ToggleButton",
105 "properties": { 134 "properties": {
106 "element": {"#": "btnUnderline"}, 135 "element": {"#": "btnUnderline"},
107 "_isToggleButton": true 136 "pressedClass": "active",
108 } 137 "preventFocus": true,
138 "identifier": "btnUnderline",
139 "pressedLabel": "U",
140 "unpressedLabel": "U"
141 },
142 "listeners": [
143 {
144 "type": "action",
145 "listener": {"@": "owner"}
146 }
147 ]
109 }, 148 },
110 "btnStrikethrough": { 149 "btnStrikethrough": {
111 "module": "js/components/button.reel", 150 "module": "montage/ui/toggle-button.reel",
112 "name": "Button", 151 "name": "ToggleButton",
113 "properties": { 152 "properties": {
114 "element": {"#": "btnStrikethrough"}, 153 "element": {"#": "btnStrikethrough"},
115 "_isToggleButton": true 154 "pressedClass": "active",
116 } 155 "preventFocus": true,
156 "identifier": "btnStrikethrough",
157 "pressedLabel": "S",
158 "unpressedLabel": "S"
159 },
160 "listeners": [
161 {
162 "type": "action",
163 "listener": {"@": "owner"}
164 }
165 ]
117 }, 166 },
118 "txtLink": { 167
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": { 168 "alignLeft": {
134 "module": "js/components/button.reel", 169 "module": "montage/ui/toggle-button.reel",
135 "name": "Button", 170 "name": "ToggleButton",
136 "properties": { 171 "properties": {
137 "element": {"#": "alignLeft"} 172 "element": {"#": "alignLeft"},
138 } 173 "pressedClass": "active",
174 "preventFocus": true,
175 "identifier": "alignLeft",
176 "pressedLabel": "Left",
1