diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/panels/color/colorpanel.js | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/color/colorpanel.js')
-rwxr-xr-x | js/panels/color/colorpanel.js | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/js/panels/color/colorpanel.js b/js/panels/color/colorpanel.js index 3a603e98..0985c717 100755 --- a/js/panels/color/colorpanel.js +++ b/js/panels/color/colorpanel.js | |||
@@ -33,21 +33,8 @@ exports.ColorPanel = Montage.create(PanelBase, { | |||
33 | this.content = this.application.ninja.colorController.colorView = this.application.ninja.colorController.colorPanelBase.create(); | 33 | this.content = this.application.ninja.colorController.colorView = this.application.ninja.colorController.colorPanelBase.create(); |
34 | //Checking for first draw to apply default colors | 34 | //Checking for first draw to apply default colors |
35 | this.content.addEventListener('firstDraw', this, false); | 35 | this.content.addEventListener('firstDraw', this, false); |
36 | |||
37 | |||
38 | //////////////////////////////////////////////////////////// | ||
39 | //////////////////////////////////////////////////////////// | ||
40 | //TODO: Remove and add via toolbar draw loop | ||
41 | |||
42 | //////////////////////////////////////////////////////////// | ||
43 | //////////////////////////////////////////////////////////// | ||
44 | |||
45 | |||
46 | } | 36 | } |
47 | }, | 37 | }, |
48 | //////////////////////////////////////////////////////////////////// | 38 | //////////////////////////////////////////////////////////////////// |
49 | //Applying default colors only on first draw | ||
50 | |||
51 | //////////////////////////////////////////////////////////////////// | ||
52 | //////////////////////////////////////////////////////////////////// | 39 | //////////////////////////////////////////////////////////////////// |
53 | }); \ No newline at end of file | 40 | }); \ No newline at end of file |