aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/ink-bottle-properties.reel
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/tools-properties/ink-bottle-properties.reel
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts: js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel')
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js65
1 files changed, 65 insertions, 0 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
index 7affe581..25823d11 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
@@ -11,6 +11,71 @@ var Montage = require("montage/core/core").Montage,
11var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, { 11var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, {
12 addedColorChips: { value: false }, 12 addedColorChips: { value: false },
13 13
14 useStrokeColor: {
15 value: null,
16 serializable: true
17 },
18
19 _strokeColorCtrl: {
20 value: null,
21 serializable: true
22 },
23
24 borderWidth: {
25 value: null,
26 serializable: true
27 },
28
29 useBorderWidth: {
30 value: null,
31 serializable: true
32 },
33
34 useBorderStyle: {
35 value: null,
36 serializable: true
37 },
38
39 borderStyle: {
40 value: null,
41 serializable: true
42 },
43
44 useStrokeSize: {
45 value: null,
46 serializable: true
47 },
48
49 strokeSize: {
50 value: null,
51 serializable: true
52 },
53
54 _useWebGL: {
55 value: null,
56 serializable: true
57 },
58
59 useWebGL: {
60 value: null,
61 serializable: true
62 },
63
64 _materialsContainer: {
65 value: null,
66 serializable: true
67 },
68
69 _strokeMaterial: {
70 value: null,
71 serializable: true
72 },
73
74 strokeMaterial: {
75 value: null,
76 serializable: true
77 },
78
14 _stroke: { 79 _stroke: {
15 enumerable: false, 80 enumerable: false,
16 value: { colorMode: 'rgb', color: { r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [1, 1, 1, 1] } 81 value: { colorMode: 'rgb', color: { r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [1, 1, 1, 1] }