diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/components/tools-properties/pen-properties.reel | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 4 | ||||
| -rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.js | 33 |
2 files changed, 32 insertions, 5 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index e720eb84..adb5cd7d 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
| @@ -38,9 +38,9 @@ | |||
| 38 | "_strokeSize": {"@": "strokeSizeHT"} | 38 | "_strokeSize": {"@": "strokeSizeHT"} |
| 39 | } | 39 | } |
| 40 | } | 40 | } |
| 41 | } | 41 | } |
| 42 | </script> | 42 | </script> |
| 43 | 43 | ||
| 44 | </head> | 44 | </head> |
| 45 | 45 | ||
| 46 | <body> | 46 | <body> |
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js index c37359e1..78065b99 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.js +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js | |||
| @@ -9,9 +9,21 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T | |||
| 9 | 9 | ||
| 10 | var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { | 10 | var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { |
| 11 | addedColorChips: { value: false }, | 11 | addedColorChips: { value: false }, |
| 12 | _penToolRadio: { value: null, enumerable: false }, | 12 | |
| 13 | _penPlusRadio: { value: null, enumerable: false }, | 13 | _penToolRadio: { |
| 14 | _penMinusRadio: { value: null, enumerable: false }, | 14 | value: null, |
| 15 | serializable: true | ||
| 16 | }, | ||
| 17 | |||
| 18 | _penPlusRadio: { | ||
| 19 | value: null, | ||
| 20 | serializable: true | ||
| 21 | }, | ||
| 22 | |||
| 23 | _penMinusRadio: { | ||
| 24 | value: null, | ||
| 25 | serializable: true | ||
| 26 | }, | ||
| 15 | 27 | ||
| 16 | _subPrepare: { | 28 | _subPrepare: { |
| 17 | value: function() { | 29 | value: function() { |
| @@ -21,6 +33,21 @@ var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { | |||
| 21 | } | 33 | } |
| 22 | }, | 34 | }, |
| 23 | 35 | ||
| 36 | _fillColorCtrl: { | ||
| 37 | value: null, | ||
| 38 | serializable: true | ||
| 39 | }, | ||
| 40 | |||
| 41 | _strokeColorCtrl: { | ||
| 42 | value: null, | ||
| 43 | serializable: true | ||
| 44 | }, | ||
| 45 | |||
| 46 | _strokeSize: { | ||
| 47 | value: null, | ||
| 48 | serializable: true | ||
| 49 | }, | ||
| 50 | |||
| 24 | _fill: { | 51 | _fill: { |
| 25 | enumerable: false, | 52 | enumerable: false, |
| 26 | 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] } | 53 | 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] } |