diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/color/colorpanel.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
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 |