Mercurial > hg > webaudioevaluationtool
changeset 827:1db3dd91fb26
Merge again....
| author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
|---|---|
| date | Thu, 26 Nov 2015 09:39:37 +0000 |
| parents | 22ad83e232f7 (diff) 1b6fa37d46a4 (current diff) |
| children | 16ee07203740 |
| files | ape.js core.js test_create/test_create.html |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ape.js Wed Nov 25 09:27:05 2015 +0000 +++ b/ape.js Thu Nov 26 09:39:37 2015 +0000 @@ -514,10 +514,14 @@ var marginSize = Number(slider.attributes['marginsize'].value); var w = slider.style.width; w = Number(w.substr(0,w.length-2)); - var x = ev.clientX; - - //x += Math.abs(window.screenX); - x = x % window.outerWidth; + var x + if (navigator.platform.substr(0,3) == "Win") + { + x = ev.screenX; + x -= Math.abs(window.screenX); + x = x % window.outerWidth; + } else + x = ev.clientX; if (x >= marginSize && x < w+marginSize) { this.style.left = (x)+'px';