aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-22 13:21:32 -0700
committerPushkar Joshi2012-05-22 13:21:32 -0700
commitf4df8204a57e1bc6021b651ebb2259f9931cf26f (patch)
tree629352d8c01214a0fa1a08be1f4a4961aa64aa32 /js/components
parent11cfa9ef2871002b600f1c18f4e06e55a826163c (diff)
downloadninja-f4df8204a57e1bc6021b651ebb2259f9931cf26f.tar.gz
allow changes in the pen subtool in options to be seen by the pen tool code (can now select the pen plus, pen minus subtools) AND
add keyboard shortcut for brush tool
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js28
1 files changed, 28 insertions, 0 deletions
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 cd205e07..aba6cb61 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.js
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js
@@ -9,6 +9,17 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
9 9
10var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { 10var PenProperties = exports.PenProperties = Montage.create(ToolProperties, {
11 addedColorChips: { value: false }, 11 addedColorChips: { value: false },
12 _penToolRadio: { value: null, enumerable: false },
13 _penPlusRadio: { value: null, enumerable: false },
14 _penMinusRadio: { value: null, enumerable: false },
15
16 _subPrepare: {
17 value: function() {
18 this._penToolRadio.addEventListener("click", this, false);
19 this._penPlusRadio.addEventListener("click", this, false);
20 this._penMinusRadio.addEventListener("click", this, false);
21 }
22 },
12 23
13 _fill: { 24 _fill: {
14 enumerable: false, 25 enumerable: false,
@@ -50,6 +61,23 @@ var PenProperties = exports.PenProperties = Montage.create(ToolProperties, {
50 } 61 }
51 }, 62 },
52 63
64 _selectedSubtool: {
65 value: "pen", enumerable: false
66 },
67
68 selectedSubtool: {
69 get: function() { return this._selectedSubtool;},
70 set: function(value) { this._selectedSubtool = value; }
71 },
72
73 handleClick: {
74 value: function(event) {
75 this._selectedSubtool = event._event.target.value;
76 console.log("handleClick changing pen tool subtool to "+this.selectedSubtool);
77 NJevent("penSubToolChange");
78 }
79 },
80
53 draw: { 81 draw: {
54 enumerable: false, 82 enumerable: false,
55 value: function () { 83 value: function () {