Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

Conflicts:
	js/stage/binding-view.reel/binding-view.js

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, {
             this.content = this.application.ninja.colorController.colorView = this.application.ninja.colorController.colorPanelBase.create();
             //Checking for first draw to apply default colors
             this.content.addEventListener('firstDraw', this, false);
-
-
-            ////////////////////////////////////////////////////////////
-            ////////////////////////////////////////////////////////////
-            //TODO: Remove and add via toolbar draw loop
-
-            ////////////////////////////////////////////////////////////
-            ////////////////////////////////////////////////////////////
-
-
         }
     },
     ////////////////////////////////////////////////////////////////////
-    //Applying default colors only on first draw
-
-    ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
 });
\ No newline at end of file