diff options
author | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
commit | e377a8dc0b0e34905782ed867acb5fe725ae0131 (patch) | |
tree | 6931311aabd7a4e366df195a168d437f1d0d8465 /js/panels/color/colorpopup-manager.js | |
parent | 8be6e94b57f4bd6e28754a6113b4d6a401365e13 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-e377a8dc0b0e34905782ed867acb5fe725ae0131.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
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 d6d94807..529ec1c8 100755 --- a/js/panels/color/colorpopup-manager.js +++ b/js/panels/color/colorpopup-manager.js | |||
@@ -70,7 +70,7 @@ exports.ColorPopupManager = Montage.create(Component, { | |||
70 | // | 70 | // |
71 | document.addEventListener('mousedown', 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.getAttribute('data-montage-id') === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.getAttribute('data-montage-id') === 'drawingCanvas') { |
74 | this.application.ninja.colorController.colorPopupManager.hideColorPopup(); | 74 | this.application.ninja.colorController.colorPopupManager.hideColorPopup(); |
75 | } | 75 | } |
76 | }.bind(this)); | 76 | }.bind(this)); |