Skip to content

Commit

Permalink
Fixed event dispatch race condition (issue #17)
Browse files Browse the repository at this point in the history
  • Loading branch information
fryn committed May 6, 2013
1 parent ba07282 commit 22e2f99
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions html5slider.js
Expand Up @@ -106,7 +106,7 @@ function check(input) {

function transform(slider) {

var isValueSet, areAttrsSet, isChanged, isClick, prevValue, rawValue, prevX;
var isValueSet, areAttrsSet, isUI, isClick, prevValue, rawValue, prevX;
var min, max, step, range, value = slider.value;

// lazily create shared slider affordance
Expand Down Expand Up @@ -185,7 +185,7 @@ function transform(slider) {
setTimeout(function() { isClick = false; }, 0);
if (e.button || !range)
return;
var width = parseFloat(getComputedStyle(this, 0).width);
var width = parseFloat(getComputedStyle(this).width);
var multiplier = (width - thumb.width) / range;
if (!multiplier)
return;
Expand All @@ -194,7 +194,7 @@ function transform(slider) {
(value - min) * multiplier;
// if click was not on thumb, move thumb to click location
if (Math.abs(dev) > thumb.radius) {
isChanged = true;
isUI = true;
this.value -= -dev / multiplier;
}
rawValue = value;
Expand All @@ -204,13 +204,13 @@ function transform(slider) {
}

function onDrag(e) {
var width = parseFloat(getComputedStyle(this, 0).width);
var width = parseFloat(getComputedStyle(this).width);
var multiplier = (width - thumb.width) / range;
if (!multiplier)
return;
rawValue += (e.clientX - prevX) / multiplier;
prevX = e.clientX;
isChanged = true;
isUI = true;
this.value = rawValue;
}

Expand All @@ -224,7 +224,7 @@ function transform(slider) {
function onKeyDown(e) {
if (e.keyCode > 36 && e.keyCode < 41) { // 37-40: left, up, right, down
onFocus.call(this);
isChanged = true;
isUI = true;
this.value = value + (e.keyCode == 38 || e.keyCode == 39 ? step : -step);
}
}
Expand Down Expand Up @@ -272,9 +272,10 @@ function transform(slider) {
// renders slider using CSS background ;)
function draw(attrsModified) {
calc();
if (isChanged && value != prevValue)
let wasUI = isUI;
isUI = false;
if (wasUI && value != prevValue)
slider.dispatchEvent(onInput);
isChanged = false;
if (!attrsModified && value == prevValue)
return;
prevValue = value;
Expand Down

0 comments on commit 22e2f99

Please sign in to comment.