Skip to content
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

Add scrolling when dragging files. Fixes #12329 #22576

Merged
merged 10 commits into from
May 20, 2016
Merged

Add scrolling when dragging files. Fixes #12329 #22576

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e03a09d
Add scrolling when dragging files
ErikPel Feb 22, 2016
5711e88
Avoids jumping if window is smaller than 300 pixels in height
MorrisJobke Feb 23, 2016
18b7b61
Tweaking
ErikPel Feb 23, 2016
e736621
typo fix
ErikPel Feb 23, 2016
45ff21e
fixed to work with share links as well
ErikPel Feb 23, 2016
d3467ed
added elseif
ErikPel Feb 23, 2016
74dfc63
code style fix
ErikPel Feb 23, 2016
b94252e
code style fix
ErikPel Feb 23, 2016
4e5f37a
code style fix
ErikPel Feb 23, 2016
5dbb549
added back the jquery animations
ErikPel Feb 23, 2016
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: 21 additions & 0 deletions apps/files/js/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ var dragOptions={
cursorAt: { left: 24, top: 18 },
helper: createDragShadow,
cursor: 'move',

start: function(event, ui){
var $selectedFiles = $('td.filename input:checkbox:checked');
if (!$selectedFiles.length) {
Expand All @@ -398,6 +399,26 @@ var dragOptions={
$selectedFiles = $(this);
}
$selectedFiles.closest('tr').fadeTo(250, 1).removeClass('dragging');
},
drag: function(event, ui) {
var scrollingArea = FileList.$container;
var currentScrollTop = $(scrollingArea).scrollTop();
var scrollArea = Math.min(Math.floor($(window).innerHeight() / 2), 100);

var bottom = $(window).innerHeight() - scrollArea;
var top = $(window).scrollTop() + scrollArea;
if (event.pageY < top) {
$('html, body').animate({

scrollTop: $(scrollingArea).scrollTop(currentScrollTop - 10)
}, 400);

} else if (event.pageY > bottom) {
$('html, body').animate({
scrollTop: $(scrollingArea).scrollTop(currentScrollTop + 10)
}, 400);
}

}
};
// sane browsers support using the distance option
Expand Down