Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 0 insertions, 16 deletions

diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index c6d664cf..d4737aad 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -9,7 +9,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage =                   require("montage/core/core").Montage,
     Component =                 require("montage/ui/component").Component,
     ColorModel =                require("js/models/color-model").ColorModel,
-    ColorToolbar =              require("js/panels/Color/colortoolbar.reel").ColorToolbar,
     ColorPanelBase =            require("js/panels/Color/colorpanelbase.reel").ColorPanelBase,
     ElementsMediator =          require("js/mediators/element-mediator").ElementMediator,
     ColorPopupManager =         require("js/panels/Color/colorpopup-manager").ColorPopupManager,
@@ -368,20 +367,5 @@ exports.ColorController = Montage.create(Component, {
                 //Must be a valid CSS or null will be returned
                 return color;
         }
-    },
-    ////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////
-    //TODO: Remove, add via toolbar repetition
-    createToolbar: {
-        enumerable: true,
-        value: function () {
-            this.colorToolbar = ColorToolbar.create();
-            this.colorToolbar.element = document.getElementById("colortoolbar");
-            this.colorToolbar.needsDraw = true;
-        }
     }
-    ////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////
 });
\ No newline at end of file