diff options
author | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
commit | 6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch) | |
tree | 253e5f6dd5923218e3155f78fa67ff3e43de0ebc /js/panels/color/colorpanel.js | |
parent | b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 |