diff options
author | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
commit | dc3c813320c8d3fb837d5d18e70ab35a53b116c1 (patch) | |
tree | da417684de5e302d302ea617854015bd9a8ca17a /js/panels/Color/colorpanel.js | |
parent | d7d78d4a4e8cf82c56379d25efbe679b3b823abc (diff) | |
parent | 4419209a1fd850ab468209b562b66b0242b42a9c (diff) | |
download | ninja-dc3c813320c8d3fb837d5d18e70ab35a53b116c1.tar.gz |
Merge branch 'brushtool' into pentool
Diffstat (limited to 'js/panels/Color/colorpanel.js')
-rwxr-xr-x | js/panels/Color/colorpanel.js | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/js/panels/Color/colorpanel.js b/js/panels/Color/colorpanel.js index 4858be68..3a603e98 100755 --- a/js/panels/Color/colorpanel.js +++ b/js/panels/Color/colorpanel.js | |||
@@ -38,7 +38,7 @@ exports.ColorPanel = Montage.create(PanelBase, { | |||
38 | //////////////////////////////////////////////////////////// | 38 | //////////////////////////////////////////////////////////// |
39 | //////////////////////////////////////////////////////////// | 39 | //////////////////////////////////////////////////////////// |
40 | //TODO: Remove and add via toolbar draw loop | 40 | //TODO: Remove and add via toolbar draw loop |
41 | this.application.ninja.colorController.createToolbar(); | 41 | |
42 | //////////////////////////////////////////////////////////// | 42 | //////////////////////////////////////////////////////////// |
43 | //////////////////////////////////////////////////////////// | 43 | //////////////////////////////////////////////////////////// |
44 | 44 | ||
@@ -47,14 +47,7 @@ exports.ColorPanel = Montage.create(PanelBase, { | |||
47 | }, | 47 | }, |
48 | //////////////////////////////////////////////////////////////////// | 48 | //////////////////////////////////////////////////////////////////// |
49 | //Applying default colors only on first draw | 49 | //Applying default colors only on first draw |
50 | handleFirstDraw: { | 50 | |
51 | enumerable: true, | ||
52 | value: function (e) { | ||
53 | // | ||
54 | this.content.applyDefaultColors(); | ||
55 | this.content.removeEventListener('firstDraw', this, false); | ||
56 | } | ||
57 | } | ||
58 | //////////////////////////////////////////////////////////////////// | 51 | //////////////////////////////////////////////////////////////////// |
59 | //////////////////////////////////////////////////////////////////// | 52 | //////////////////////////////////////////////////////////////////// |
60 | }); \ No newline at end of file | 53 | }); \ No newline at end of file |