aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel/text-properties.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 01:03:59 -0700
committerArmen Kesablyan2012-06-19 01:03:59 -0700
commit2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
treed352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/tools-properties/text-properties.reel/text-properties.js
parent244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
downloadninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.js')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js44
1 files changed, 22 insertions, 22 deletions
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 35d46cc7..72a6f034 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -10,28 +10,28 @@ var ArrayController = require("montage/ui/controller/array-controller").ArrayCon
10var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; 10var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
11 11
12exports.TextProperties = Montage.create(ToolProperties, { 12exports.TextProperties = Montage.create(ToolProperties, {
13 className: {value: null}, 13 className: {value: null, serializable: true},
14 tagType: {value: null}, 14 tagType: {value: null, serializable: true},
15 fontSelection: {value: null}, 15 fontSelection: {value: null, serializable: true},
16 fontSettings: {value: null}, 16 fontSettings: {value: null, serializable: true},
17 fontSize: {value: null}, 17 fontSize: {value: null, serializable: true},
18 fontColor: {value: null}, 18 fontColor: {value: null, serializable: true},
19 btnBold: {value: null}, 19 btnBold: {value: null, serializable: true},
20 btnItalic: {value: null}, 20 btnItalic: {value: null, serializable: true},
21 btnUnderline: {value: null}, 21 btnUnderline: {value: null, serializable: true},
22 btnStrikethrough: {value: null}, 22 btnStrikethrough: {value: null, serializable: true},
23 txtLink: {value: null}, 23 txtLink: {value: null, serializable: true},
24 linkTarget: {value: null}, 24 linkTarget: {value: null, serializable: true},
25 alignLeft: {value: null}, 25 alignLeft: {value: null, serializable: true},
26 alignCenter: {value: null}, 26 alignCenter: {value: null, serializable: true},
27 alignRight: {value: null}, 27 alignRight: {value: null, serializable: true},
28 alignJustify: {value: null}, 28 alignJustify: {value: null, serializable: true},
29 indent: {value: null}, 29 indent: {value: null, serializable: true},
30 outdent: {value: null}, 30 outdent: {value: null, serializable: true},
31 numberedList: {value: null}, 31 numberedList: {value: null, serializable: true},
32 bulletedList: {value: null}, 32 bulletedList: {value: null, serializable: true},
33 fontTypes: {value: null}, 33 fontTypes: {value: null, serializable: true},
34 fontSizes: {value: null}, 34 fontSizes: {value: null, serializable: true},
35 35
36 prepareForDraw: { 36 prepareForDraw: {
37 value: function() { 37 value: function() {