aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Color/colorpanelbase.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-14 10:16:18 -0800
committerArmen Kesablyan2012-02-14 10:16:18 -0800
commit581078a71995f36b7d3a85bc724bef7c7919bb81 (patch)
treef0ddd66c3b2ff6d5662e6dca3d4f8836388edd0f /js/panels/Color/colorpanelbase.reel
parentf979f47658a03640cc81e729e3cf88d80f8ec366 (diff)
parentace16ef22b3ff32663504df7720af481d76987d6 (diff)
downloadninja-581078a71995f36b7d3a85bc724bef7c7919bb81.tar.gz
Merge branch 'refs/heads/master' into text-tool
Diffstat (limited to 'js/panels/Color/colorpanelbase.reel')
-rw-r--r--js/panels/Color/colorpanelbase.reel/colorpanelbase.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
index 9a27689a..ff738bbe 100644
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
@@ -1499,13 +1499,13 @@ exports.ColorPanelBase = Montage.create(Component, {
1499 // 1499 //
1500 if (type._event.clientX && type._event.clientY) { 1500 if (type._event.clientX && type._event.clientY) {
1501 // 1501 //
1502 if (type._event.clientX > (parseInt(document.width)/2)) { 1502 //if (type._event.clientX > (parseInt(document.width)/2)) {
1503 //TODO: Fix offset hack 1503 //TODO: Fix offset hack
1504 this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX) +'px', (type._event.target.clientHeight/2+type._event.clientY - type._event.offsetY)+'px', 'right', 'top'); 1504 this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX) +'px', (type._event.target.clientHeight/2+type._event.clientY - type._event.offsetY)+'px', 'right', 'top');
1505 } else { 1505 //} else {
1506 // 1506 //
1507 this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top'); 1507 // this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top');
1508 } 1508 //}
1509 } 1509 }
1510 } 1510 }
1511 } else { 1511 } else {