Skip to content

Ensure we can drag to end of list #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jthibeaux wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Ensure we can drag to end of list #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fcdb956
ensure we can drag to end of list
jthibeaux Mar 1, 2018
152ccb8
make sure it still always work when dragging to front of list
jthibeaux Mar 1, 2018
1d3c92a
build
jthibeaux Mar 1, 2018
a19d3a2
Merge remote-tracking branch 'upstream/master'
jthibeaux Jun 28, 2018
77bf0c3
add as-sortable-touching class when long touch initiated
jthibeaux Jun 28, 2018
dbda718
touching class must only be added after timeout
jthibeaux Jun 28, 2018
effae6e
more touching fixes
jthibeaux Jun 28, 2018
40fbe3a
touching fixes
jthibeaux Jun 28, 2018
2ee108e
fix typo
jthibeaux Jul 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions dist/ng-sortable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
placeHolderClass: 'as-sortable-placeholder',
dragClass: 'as-sortable-drag',
hiddenClass: 'as-sortable-hidden',
dragging: 'as-sortable-dragging'
dragging: 'as-sortable-dragging',
touching: 'as-sortable-touching'
});
}());

Expand Down Expand Up @@ -717,17 +718,19 @@
* @param event the event object.
*/
dragStart = function (event) {

var eventObj, tagName;

if (!hasTouch && (event.button === 2 || event.which === 3)) {
element.removeClass(sortableConfig.touching);
// disable right click
return;
}
if (hasTouch && $helper.isTouchInvalid(event)) {
element.removeClass(sortableConfig.touching);
return;
}
if (dragHandled || !isDraggable(event)) {
element.removeClass(sortableConfig.touching);
// event has already fired in other scope.
return;
}
Expand Down Expand Up @@ -767,6 +770,8 @@
.addClass(scope.sortableScope.element.attr('class')).addClass(sortableConfig.dragClass);
dragElement.css('width', $helper.width(scope.itemScope.element) + 'px');
dragElement.css('height', $helper.height(scope.itemScope.element) + 'px');
// no longer need touching class
element.removeClass(sortableConfig.touching);

placeHolder = createPlaceholder(scope.itemScope)
.addClass(sortableConfig.placeHolderClass).addClass(scope.sortableScope.options.additionalPlaceholderClass);
Expand Down Expand Up @@ -935,7 +940,15 @@
if (placeholderIndex < 0) {
insertBefore(targetElement, targetScope);
} else {
if (placeholderIndex <= targetScope.index()) {
// FIX: needed to check if placeholder is at the end so we
// allow it to be inserted after the last element.
if (
placeholderIndex <= targetScope.index() ||
(
targetScope.index() !== 0 &&
placeholderIndex === targetScope.sortableScope.modelValue.length
)
) {
insertAfter(targetElement, targetScope);
} else {
insertBefore(targetElement, targetScope);
Expand Down Expand Up @@ -1119,6 +1132,7 @@
*/
longTouchStart = function(event) {
longTouchTimer = $timeout(function() {
element.addClass(sortableConfig.touching);
dragListen(event);
}, 500);
};
Expand All @@ -1127,6 +1141,7 @@
* cancel the long touch and its timer.
*/
longTouchCancel = function() {
element.removeClass(sortableConfig.touching);
$timeout.cancel(longTouchTimer);
};

Expand Down
Loading