diff options
author | Jose Antonio Marquez | 2012-02-17 00:20:42 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-17 00:20:42 -0800 |
commit | 7e9c50aaa9774f1c8840e19d831ed2e7bfd9f61f (patch) | |
tree | 0a51be74f0d5b1f6c740cd1a9c79e00624a0c0af /js | |
parent | 9fe5d98bf469036c856e28d71ad4160d630b4af4 (diff) | |
parent | 18a42c37d080c03830c3f0a4156b81044e6309ee (diff) | |
download | ninja-7e9c50aaa9774f1c8840e19d831ed2e7bfd9f61f.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js')
30 files changed, 844 insertions, 51 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 a7d2af10..13a88ba7 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -100,7 +100,8 @@ | |||
100 | "pressedClass": "active", | 100 | "pressedClass": "active", |
101 | "preventFocus": true, | 101 | "preventFocus": true, |
102 | "identifier": "btnBold", | 102 | "identifier": "btnBold", |
103 | "label": "B" | 103 | "pressedLabel": "B", |
104 | "unpressedLabel": "B" | ||
104 | }, | 105 | }, |
105 | "listeners": [ | 106 | "listeners": [ |
106 | { | 107 | { |
@@ -117,7 +118,8 @@ | |||
117 | "pressedClass": "active", | 118 | "pressedClass": "active", |
118 | "preventFocus": true, | 119 | "preventFocus": true, |
119 | "identifier": "btnItalic", | 120 | "identifier": "btnItalic", |
120 | "label": "I" | 121 | "pressedLabel": "I", |
122 | "unpressedLabel": "I" | ||
121 | }, | 123 | }, |
122 | "listeners": [ | 124 | "listeners": [ |
123 | { | 125 | { |
@@ -134,7 +136,8 @@ | |||
134 | "pressedClass": "active", | 136 | "pressedClass": "active", |
135 | "preventFocus": true, | 137 | "preventFocus": true, |
136 | "identifier": "btnUnderline", | 138 | "identifier": "btnUnderline", |
137 | "label": "U" | 139 | "pressedLabel": "U", |
140 | "unpressedLabel": "U" | ||
138 | }, | 141 | }, |
139 | "listeners": [ | 142 | "listeners": [ |
140 | { | 143 | { |
@@ -151,7 +154,8 @@ | |||
151 | "pressedClass": "active", | 154 | "pressedClass": "active", |
152 | "preventFocus": true, | 155 | "preventFocus": true, |
153 | "identifier": "btnStrikethrough", | 156 | "identifier": "btnStrikethrough", |
154 | "label": "S" | 157 | "pressedLabel": "S", |
158 | "unpressedLabel": "S" | ||
155 | }, | 159 | }, |
156 | "listeners": [ | 160 | "listeners": [ |
157 | { | 161 | { |
@@ -169,7 +173,8 @@ | |||
169 | "pressedClass": "active", | 173 | "pressedClass": "active", |
170 | "preventFocus": true, | 174 | "preventFocus": true, |
171 | "identifier": "alignLeft", | 175 | "identifier": "alignLeft", |
172 | "label": "Left" | 176 | "pressedLabel": "Left", |
177 | "unpressedLabel": "Left" | ||
173 | }, | 178 | }, |
174 | "listeners": [ | 179 | "listeners": [ |
175 | { | 180 | { |
@@ -186,7 +191,8 @@ | |||
186 | "pressedClass": "active", | 191 | "pressedClass": "active", |
187 | "preventFocus": true, | 192 | "preventFocus": true, |
188 | "identifier": "alignCenter", | 193 | "identifier": "alignCenter", |
189 | "label": "Center" | 194 | "pressedLabel": "Center", |
195 | "unpressedLabel": "Center" | ||
190 | }, | 196 | }, |
191 | "listeners": [ | 197 | "listeners": [ |
192 | { | 198 | { |
@@ -203,7 +209,8 @@ | |||
203 | "pressedClass": "active", | 209 | "pressedClass": "active", |
204 | "preventFocus": true, | 210 | "preventFocus": true, |
205 | "identifier": "alignRight", | 211 | "identifier": "alignRight", |
206 | "label": "Right" | 212 | "pressedLabel": "Right", |
213 | "unpressedLabel": "Right" | ||
207 | }, | 214 | }, |
208 | "listeners": [ | 215 | "listeners": [ |
209 | { | 216 | { |
@@ -220,7 +227,8 @@ | |||
220 | "pressedClass": "active", | 227 | "pressedClass": "active", |
221 | "preventFocus": true, | 228 | "preventFocus": true, |
222 | "identifier": "alignJustify", | 229 | "identifier": "alignJustify", |
223 | "label": "Justify" | 230 | "pressedLabel": "Justify", |
231 | "unpressedLabel": "Justify" | ||
224 | }, | 232 | }, |
225 | "listeners": [ | 233 | "listeners": [ |
226 | { | 234 | { |
@@ -271,7 +279,8 @@ | |||
271 | "pressedClass": "active", | 279 | "pressedClass": "active", |
272 | "preventFocus": true, | 280 | "preventFocus": true, |
273 | "identifier": "bulletedList", | 281 | "identifier": "bulletedList", |
274 | "label": "• • •" | 282 | "pressedLabel": "• • •", |
283 | "unpressedLabel": "• • •" | ||
275 | }, | 284 | }, |
276 | "listeners": [ | 285 | "listeners": [ |
277 | { | 286 | { |
@@ -288,7 +297,8 @@ | |||
288 | "pressedClass": "active", | 297 | "pressedClass": "active", |
289 | "preventFocus": true, | 298 | "preventFocus": true, |
290 | "identifier": "numberedList", | 299 | "identifier": "numberedList", |
291 | "label": "1 2 3" | 300 | "pressedLabel": "1 2 3", |
301 | "unpressedLabel": "1 2 3" | ||
292 | }, | 302 | }, |
293 | "listeners": [ | 303 | "listeners": [ |
294 | { | 304 | { |
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css index a3a9350e..340233c7 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.css +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css | |||
@@ -26,7 +26,6 @@ | |||
26 | cursor: pointer; | 26 | cursor: pointer; |
27 | font-weight: bold; | 27 | font-weight: bold; |
28 | padding: 3px 0 4px; | 28 | padding: 3px 0 4px; |
29 | text-shadow: 1px 1px 1px #000; | ||
30 | } | 29 | } |
31 | 30 | ||
32 | /* First Level */ | 31 | /* First Level */ |
diff --git a/js/controllers/elements/component-controller.js b/js/controllers/elements/component-controller.js index 33b9b79a..83450d0f 100755 --- a/js/controllers/elements/component-controller.js +++ b/js/controllers/elements/component-controller.js | |||
@@ -12,20 +12,19 @@ exports.ComponentController = Montage.create(ElementController, { | |||
12 | getProperty: { | 12 | getProperty: { |
13 | value: function(el, prop) { | 13 | value: function(el, prop) { |
14 | switch(prop) { | 14 | switch(prop) { |
15 | case "label": | 15 | case "id": |
16 | return this.application.ninja.currentDocument.getComponentFromElement(el).label; | 16 | case "class": |
17 | break; | 17 | case "left": |
18 | case "enabled": | 18 | case "top": |
19 | return this.application.ninja.currentDocument.getComponentFromElement(el).enabled; | 19 | case "width": |
20 | break; |