diff options
author | Pushkar Joshi | 2012-03-02 12:24:33 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-03-02 12:24:33 -0800 |
commit | 4419209a1fd850ab468209b562b66b0242b42a9c (patch) | |
tree | bd7ca04f963f5a3aeb4b3c06db6f187903307d45 /js/panels/Color/colorpanelbase.reel/colorpanelbase.js | |
parent | 1b68bb87c458877cb850a96d8a093d6064bc41dc (diff) | |
parent | ff0a956f33df034e9a009cfcb8999e469456a4b5 (diff) | |
download | ninja-4419209a1fd850ab468209b562b66b0242b42a9c.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Color/colorpanelbase.reel/colorpanelbase.js')
-rwxr-xr-x | js/panels/Color/colorpanelbase.reel/colorpanelbase.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js index ff738bbe..af62dd07 100755 --- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js +++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js | |||
@@ -117,10 +117,23 @@ exports.ColorPanelBase = Montage.create(Component, { | |||
117 | enumerable: false, | 117 | enumerable: false, |
118 | value: function() { | 118 | value: function() { |
119 | //TODO: Remove temporary hack, color history should be initilized | 119 | //TODO: Remove temporary hack, color history should be initilized |
120 | this.addEventListener('firstDraw', this, false); | ||
121 | this.application.ninja.colorController.colorView = this; | ||
120 | this.colorManager.colorHistory.fill = [{m: 'nocolor', c: {}, a: 1}]; | 122 | this.colorManager.colorHistory.fill = [{m: 'nocolor', c: {}, a: 1}]; |
121 | this.colorManager.colorHistory.stroke = [{m: 'nocolor', c: {}, a: 1}]; | 123 | this.colorManager.colorHistory.stroke = [{m: 'nocolor', c: {}, a: 1}]; |
122 | } | 124 | } |
123 | }, | 125 | }, |
126 | |||
127 | handleFirstDraw: { | ||
128 | enumerable: true, | ||
129 | value: function (e) { | ||
130 | // | ||
131 | this.application.ninja.colorController.createToolbar(); | ||
132 | this.applyDefaultColors(); | ||
133 | this.removeEventListener('firstDraw', this, false); | ||
134 | } | ||
135 | }, | ||
136 | |||
124 | //////////////////////////////////////////////////////////////////// | 137 | //////////////////////////////////////////////////////////////////// |
125 | //Assigning values and binding | 138 | //Assigning values and binding |
126 | willDraw: { | 139 | willDraw: { |