Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

3 files changed, 1 insertions, 3 deletions

diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.js b/js/panels/color/colorchippopup.reel/colorchippopup.js
index 05bcb447..414be8b7 100755
--- a/js/panels/color/colorchippopup.reel/colorchippopup.js
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.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,
         Slider =                        require("js/components/slider.reel").Slider,
-        Button =                        require("js/components/button.reel").Button,
         HotText =                       require("js/components/hottext.reel").HotText,
         ColorWheel =            require("js/components/colorwheel.reel").ColorWheel,
         GradientPicker =        require("js/components/gradientpicker.reel").GradientPicker;
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
index b957d495..dd7e6192 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.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,
         Slider =                        require("js/components/slider.reel").Slider,
-        Button =                        require("js/components/button.reel").Button,
         HotText =                       require("js/components/hottext.reel").HotText,
         ColorWheel =            require("js/components/colorwheel.reel").ColorWheel,
         GradientPicker =        require("js/components/gradientpicker.reel").GradientPicker;
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index a4c9a8c2..d6d94807 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -68,7 +68,7 @@ exports.ColorPopupManager = Montage.create(Component, {
                 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
             }.bind(this));
             //
-            document.addEventListener('click', function (e) {
+            document.addEventListener('mousedown', function (e) {
                 //
                 if (e._event.srcElement.id === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.id === 'drawingCanvas') {
                         this.application.ninja.colorController.colorPopupManager.hideColorPopup();