diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/panels/color/colorpanel.js | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 |