Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up drag on iOS handling, we need it bound earlier

This commit is contained in:
Sam 2018-04-30 16:43:56 +10:00 committed by Régis Hanol
parent 3fee06ae59
commit 3be4982186
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/discourse/widgets/hooks.js.es6
View File

@ -55,9 +55,11 @@ let _dragging;
const DRAG_NAME = "mousemove.discourse-widget-drag"; const DRAG_NAME = "mousemove.discourse-widget-drag";
function cancelDrag(e, onDrag) { function cancelDrag(e) {
$('body').removeClass('widget-dragging'); $('body').removeClass('widget-dragging');
document.removeEventListener('touchmove', onDrag); $(document).off(DRAG_NAME);
// We leave the drag event cause touch needs it always bound on iOS
if (_dragging) { if (_dragging) {
if (_dragging.dragEnd) { _dragging.dragEnd(e); } if (_dragging.dragEnd) { _dragging.dragEnd(e); }
@ -78,9 +80,10 @@ WidgetClickHook.setupDocumentCallback = function() {
} }
}; };
document.addEventListener('touchmove', onDrag, { passive: false, capture: true });
$(document).on('mousedown.discource-widget-drag, touchstart.discourse-widget-drag', e => { $(document).on('mousedown.discource-widget-drag, touchstart.discourse-widget-drag', e => {
cancelDrag(e, onDrag); cancelDrag(e);
widget = findWidget(e.target, DRAG_ATTRIBUTE_NAME); widget = findWidget(e.target, DRAG_ATTRIBUTE_NAME);
if (widget) { if (widget) {
e.preventDefault(); e.preventDefault();
@ -92,11 +95,13 @@ WidgetClickHook.setupDocumentCallback = function() {
widget.drag(dragE); widget.drag(dragE);
} }
}); });
document.addEventListener('touchmove', onDrag, { passive: false, capture: true });
} }
}); });
$(document).on('mouseup.discourse-widget-drag, touchend.discourse-widget-drag', e => cancelDrag(e, onDrag)); $(document).on('mouseup.discourse-widget-drag, touchend.discourse-widget-drag', e => {
widget = null;
cancelDrag(e);
});
$(document).on('click.discourse-widget', e => { $(document).on('click.discourse-widget', e => {
nodeCallback(e.target, CLICK_ATTRIBUTE_NAME, w => w.click(e)); nodeCallback(e.target, CLICK_ATTRIBUTE_NAME, w => w.click(e));