Merge branch 'refs/heads/Ninja-Internal' into Color

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, {
             ////////////////////////////////////////////////////////////
             ////////////////////////////////////////////////////////////
             //TODO: Remove and add via toolbar draw loop
-            this.application.ninja.colorController.createToolbar();
+
             ////////////////////////////////////////////////////////////
             ////////////////////////////////////////////////////////////
 
@@ -47,14 +47,7 @@ exports.ColorPanel = Montage.create(PanelBase, {
     },
     ////////////////////////////////////////////////////////////////////
     //Applying default colors only on first draw
-    handleFirstDraw: {
-        enumerable: true,
-        value: function (e) {
-                //
-                this.content.applyDefaultColors();
-                this.content.removeEventListener('firstDraw', this, false);
-        }
-    }
+
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
 });
\ No newline at end of file