Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
f7920e4b
Commit
f7920e4b
authored
Nov 07, 2016
by
Vincent Petry
Committed by
GitHub
Nov 07, 2016
Browse files
Merge pull request #26555 from mjobst-necls/fix_folder_drag_drop-patch
disabling dropping on dragging objects temporarily
parents
9fe72060
38edf57a
Changes
1
Hide whitespace changes
Inline
Side-by-side
apps/files/js/files.js
View file @
f7920e4b
...
...
@@ -379,14 +379,19 @@ var dragOptions={
$selectedFiles
=
$
(
this
);
}
$selectedFiles
.
closest
(
'
tr
'
).
addClass
(
'
animate-opacity dragging
'
);
$selectedFiles
.
closest
(
'
tr
'
).
filter
(
'
.ui-droppable
'
).
droppable
(
'
disable
'
);
},
stop
:
function
(
event
,
ui
)
{
var
$selectedFiles
=
$
(
'
td.filename input:checkbox:checked
'
);
if
(
!
$selectedFiles
.
length
)
{
$selectedFiles
=
$
(
this
);
}
var
$tr
=
$selectedFiles
.
closest
(
'
tr
'
);
$tr
.
removeClass
(
'
dragging
'
);
$tr
.
filter
(
'
.ui-droppable
'
).
droppable
(
'
enable
'
);
setTimeout
(
function
()
{
$tr
.
removeClass
(
'
animate-opacity
'
);
},
300
);
...
...
@@ -454,4 +459,3 @@ function fileDownloadPath(dir, file) {
// for backward compatibility
window
.
Files
=
OCA
.
Files
.
Files
;
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment