Skip to content

Commit

Permalink
release slider on mouseup
Browse files Browse the repository at this point in the history
  • Loading branch information
annavester committed Nov 24, 2015
1 parent dc1922c commit 191d9ce
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions app/color/color_directives.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ angular.module('ADE').directive('adeColor', ['ADE', '$compile', '$filter', 'colo
var stopObserving = null;
var adeId = scope.adeId;
var draggingPicker = null;
var draggingSlider = null;

function keepWithin(value, min, max) {
if (value < min) value = min;
Expand Down Expand Up @@ -310,22 +311,25 @@ angular.module('ADE').directive('adeColor', ['ADE', '$compile', '$filter', 'colo
}
}).on('mouseup.ADE', function() {;
if (draggingPicker) draggingPicker.parent().trigger("mouseup.ADE");
if (draggingSlider) draggingSlider.trigger("mouseup.ADE");
});

slider.on('mousedown.ADE', function(event) {
if (!draggingPicker) {
var _target = angular.element(this);
_target.data('adePickerTarget', _target);
_target.data('adeSliderTarget', _target);
draggingSlider = _target;
move(_target, event);
}
}).on('mousemove.ADE', function(event) {
var _target = angular.element(this);
if (_target.data('adePickerTarget')) {
if (_target.data('adeSliderTarget')) {
window.clearTimeout(timeout);
move(_target, event);
}
}).on('mouseup.ADE', function(event) {
angular.element(this).removeData('adePickerTarget');
}).on('mouseup.ADE', function() {
draggingSlider = null;
angular.element(this).removeData('adeSliderTarget');
});

if(ADE.keyboardEdit) input.focus();
Expand Down

0 comments on commit 191d9ce

Please sign in to comment.