diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/tools-properties/tag-properties.reel/tag-properties.js | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/tools-properties/tag-properties.reel/tag-properties.js')
-rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.js | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js index 52c6f44c..d38419aa 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.js +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js | |||
@@ -9,16 +9,26 @@ var Component = require("montage/ui/component").Component; | |||
9 | var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; | 9 | var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; |
10 | 10 | ||
11 | var TagProperties = exports.TagProperties = Montage.create(ToolProperties, { | 11 | var TagProperties = exports.TagProperties = Montage.create(ToolProperties, { |
12 | divElement: { value: null, enumerable: false }, | 12 | divElement: { |
13 | imageElement: { value: null, enumerable: false }, | 13 | value: null, |
14 | videoElement: { value: null, enumerable: false }, | 14 | serializable: true |
15 | canvasElement: { value: null, enumerable: false }, | 15 | }, |
16 | customElement: { value: null, enumerable: false }, | 16 | |
17 | classField: { value: null, enumerable: false }, | 17 | imageElement: { value: null, serializable: true }, |
18 | customName: { value: null, enumerable: false }, | 18 | videoElement: { value: null, serializable: true }, |
19 | customLabel: { value: null, enumerable: false }, | 19 | canvasElement: { value: null, serializable: true }, |
20 | customElement: { value: null, serializable: true }, | ||
21 | classField: { value: null, serializable: true }, | ||
22 | customName: { value: null, serializable: true }, | ||
23 | customLabel: { value: null, serializable: true }, | ||
24 | |||
20 | addedColorChips: { value: false }, | 25 | addedColorChips: { value: false }, |
21 | 26 | ||
27 | _fillColorCtrl: { | ||
28 | value: null, | ||
29 | serializable: true | ||
30 | }, | ||
31 | |||
22 | _fill: { | 32 | _fill: { |
23 | enumerable: false, | 33 | enumerable: false, |
24 | value: { colorMode: 'nocolor', color: null, webGlColor: null } | 34 | value: { colorMode: 'nocolor', color: null, webGlColor: null } |