diff options
author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/panels/Color/colorpanelbase.reel/colorpanelbase.js | |
parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/panels/Color/colorpanelbase.reel/colorpanelbase.js')
-rw-r--r-- | js/panels/Color/colorpanelbase.reel/colorpanelbase.js | 8 |
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 { |