diff options
Diffstat (limited to 'js/components/tools-properties')
4 files changed, 83 insertions, 2 deletions
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.css b/js/components/tools-properties/binding-properties.reel/binding-properties.css new file mode 100755 index 00000000..19d2b6c6 --- /dev/null +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.css | |||
@@ -0,0 +1,17 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | .bindingSubTools { | ||
8 | padding:9px; | ||
9 | font-size:12px; | ||
10 | } | ||
11 | |||
12 | .bindingSubTools label { | ||
13 | |||
14 | } | ||
15 | .bindingSubTools input[type=checkbox] { | ||
16 | margin: 0px 3px; | ||
17 | } \ No newline at end of file | ||
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html new file mode 100755 index 00000000..cd0e0a50 --- /dev/null +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html | |||
@@ -0,0 +1,35 @@ | |||
1 | <!DOCTYPE HTML> | ||
2 | <!-- <copyright> | ||
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/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html> | ||
8 | <head> | ||
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
10 | <link rel="stylesheet" type="text/css" href="binding-properties.css"> | ||
11 | |||
12 | <script type="text/montage-serialization"> | ||
13 | { | ||
14 | |||
15 | "owner": { | ||
16 | "prototype": "js/components/tools-properties/binding-properties.reel", | ||
17 | "properties": { | ||
18 | "element": {"#": "bindingProperties"} | ||
19 | } | ||
20 | } | ||
21 | } | ||
22 | </script> | ||
23 | |||
24 | </head> | ||
25 | |||
26 | <body> | ||
27 | <div id="bindingProperties" class="subToolHolderPanel bindingSubTools"> | ||
28 | <input class="nj-skinned" type="checkbox" /> | ||
29 | <label>View All Bindings</label> | ||
30 | </div> | ||
31 | </body> | ||
32 | |||
33 | </html> | ||
34 | |||
35 | \ No newline at end of file | ||
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.js b/js/components/tools-properties/binding-properties.reel/binding-properties.js new file mode 100755 index 00000000..8d30d855 --- /dev/null +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.js | |||
@@ -0,0 +1,25 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | var Montage = require("montage/core/core").Montage; | ||
8 | var Component = require("montage/ui/component").Component; | ||
9 | var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; | ||
10 | |||
11 | exports.BindingProperties = Montage.create(ToolProperties, { | ||
12 | |||
13 | _subPrepare: { | ||
14 | value: function() { | ||
15 | |||
16 | } | ||
17 | }, | ||
18 | |||
19 | handleClick: { | ||
20 | value: function(event) { | ||
21 | |||
22 | } | ||
23 | } | ||
24 | |||
25 | }); \ No newline at end of file | ||
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js index 72a6f034..c5729e98 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.js +++ b/js/components/tools-properties/text-properties.reel/text-properties.js | |||
@@ -296,14 +296,18 @@ exports.TextProperties = Montage.create(ToolProperties, { | |||
296 | 296 | ||
297 | handleFontSelectionChange: { | 297 | handleFontSelectionChange: { |
298 | value: function(e) { | 298 | value: function(e) { |
299 | this.application.ninja.stage.textTool.doAction("fontname", this.fontSelection.value); | ||
300 | this.application.ninja.stage.textTool.element.focus(); | 299 | this.application.ninja.stage.textTool.element.focus(); |
300 | this.application.ninja.stage.textTool.doAction("fontname", this.fontSelection.value); | ||
301 | |||
302 | //Note: Set Font Color on selection to ColorChip Component; | ||
303 | //this.this.application.ninja.stage.textTool.foreColor | ||
304 | |||
301 | } | 305 | } |
302 | }, | 306 | }, |
303 | 307 | ||
304 | handleFontColorChange: { | 308 | handleFontColorChange: { |
305 | value: function(e) { | 309 | value: function(e) { |
306 | this.application.ninja.stage.textTool.element.style.color = e._event.color.css; | 310 | this.application.ninja.stage.textTool.foreColor = e._event.color.css; |
307 | this.application.ninja.stage.textTool.element.focus(); | 311 | this.application.ninja.stage.textTool.element.focus(); |
308 | //this.application.ninja.stage.textTool.doAction("forecolor",e._event.color.css); | 312 | //this.application.ninja.stage.textTool.doAction("forecolor",e._event.color.css); |
309 | 313 | ||