diff options
| author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
| commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
| tree | e778f2b9d5d525aa364360d5996536a0a06379bd /js/panels/color/colorpopup-manager.js | |
| parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz | |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
Diffstat (limited to 'js/panels/color/colorpopup-manager.js')
| -rwxr-xr-x | js/panels/color/colorpopup-manager.js | 2 |
1 files changed, 1 insertions, 1 deletions
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, { | |||
| 68 | this.application.ninja.colorController.colorPopupManager.hideColorPopup(); | 68 | this.application.ninja.colorController.colorPopupManager.hideColorPopup(); |
| 69 | }.bind(this)); | 69 | }.bind(this)); |
| 70 | // | 70 | // |
| 71 | document.addEventListener('click', function (e) { | 71 | document.addEventListener('mousedown', function (e) { |
| 72 | // | 72 | // |
| 73 | if (e._event.srcElement.id === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.id === 'drawingCanvas') { | 73 | if (e._event.srcElement.id === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.id === 'drawingCanvas') { |
| 74 | this.application.ninja.colorController.colorPopupManager.hideColorPopup(); | 74 | this.application.ninja.colorController.colorPopupManager.hideColorPopup(); |