Merge branch 'master' into brushtool

2 files changed, 15 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
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
index ff738bbe..af62dd07 100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
@@ -117,10 +117,23 @@ exports.ColorPanelBase = Montage.create(Component, {
         enumerable: false,
         value: function() {
                 //TODO: Remove temporary hack, color history should be initilized
+            this.addEventListener('firstDraw', this, false);
+            this.application.ninja.colorController.colorView = this;
                 this.colorManager.colorHistory.fill = [{m: 'nocolor', c: {}, a: 1}];
                 this.colorManager.colorHistory.stroke = [{m: 'nocolor', c: {}, a: 1}];
         }
     },
+
+    handleFirstDraw: {
+        enumerable: true,
+        value: function (e) {
+            //
+            this.application.ninja.colorController.createToolbar();
+            this.applyDefaultColors();
+            this.removeEventListener('firstDraw', this, false);
+        }
+    },
+
     ////////////////////////////////////////////////////////////////////
     //Assigning values and binding
     willDraw: {