Skip to content

[stable15] Clean code and fix drop zone shadow #13982

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

Merged
MorrisJobke merged 11 commits into from
Feb 8, 2019
Merged

[stable15] Clean code and fix drop zone shadow #13982

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1f9c881
Remove hack to prefetch the starred trash icon
danxuliu Jan 31, 2019
7b7da7b
Remove leftover from a WIP
danxuliu Jan 31, 2019
e94412e
Remove duplicated variable declaration
danxuliu Jan 31, 2019
414804d
Remove unneeded triggering of event
danxuliu Jan 31, 2019
8e6cedb
Add missing trailing ";"
danxuliu Jan 31, 2019
c72e75c
Replace double quotes with single quotes
danxuliu Jan 31, 2019
e2c4dbc
Make code format more consistent with the rest of the file
danxuliu Jan 31, 2019
66b908f
Use full names instead of abbreviations in variable names
danxuliu Jan 31, 2019
371df90
Unify handling of dropping one file or several files on the trash bin
danxuliu Jan 31, 2019
df01d12
Fix drop zone shadow
newhinton Dec 7, 2018
150d15b
Extract variable for yellow color in icons
newhinton Dec 7, 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
Prev Previous commit
Next Next commit
Replace double quotes with single quotes 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
  • Loading branch information
@danxuliu
danxuliu committed Feb 1, 2019
commit c72e75c4c3fb03a15602dbbab0e967dfa23bd30a
2 changes: 1 addition & 1 deletion apps/files/js/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@

this.$fileList.on('click','td.filename>a.name, td.filesize, td.date', _.bind(this._onClickFile, this));

this.$fileList.on("droppedOnTrash", function (event, filename, directory) {
this.$fileList.on('droppedOnTrash', function (event, filename, directory) {
self.do_delete(filename, directory);
});

Expand Down
14 changes: 7 additions & 7 deletions apps/files/js/navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
this.$el.on('click', 'li a', _.bind(this._onClickItem, this));
this.$el.on('click', 'li button', _.bind(this._onClickMenuButton, this));

var trashElement=$(".nav-trashbin");
var trashElement=$('.nav-trashbin');
trashElement.droppable({
over: function( event, ui ) {
trashElement.addClass('dropzone-background');
Expand All @@ -74,24 +74,24 @@
trashElement.removeClass('dropzone-background');
},
activate: function( event, ui ) {
var elem=trashElement.find("a").first();
var elem=trashElement.find('a').first();
elem.addClass('nav-icon-trashbin-starred').removeClass('nav-icon-trashbin');
},
deactivate: function( event, ui ) {
var elem=trashElement.find("a").first();
var elem=trashElement.find('a').first();
elem.addClass('nav-icon-trashbin').removeClass('nav-icon-trashbin-starred');
},
drop: function( event, ui ) {

var $selectedFiles = $(ui.draggable);

if (ui.helper.find("tr").size()===1) {
if (ui.helper.find('tr').size()===1) {
var $tr = $selectedFiles.closest('tr');
$selectedFiles.trigger("droppedOnTrash", $tr.attr("data-file"), $tr.attr('data-dir'));
$selectedFiles.trigger('droppedOnTrash', $tr.attr('data-file'), $tr.attr('data-dir'));
}else{
var item = ui.helper.find("tr");
var item = ui.helper.find('tr');
for(var i=0; i<item.length;i++){
$selectedFiles.trigger("droppedOnTrash", item[i].getAttribute("data-file"), item[i].getAttribute("data-dir"));
$selectedFiles.trigger('droppedOnTrash', item[i].getAttribute('data-file'), item[i].getAttribute('data-dir'));
}
}
}
Expand Down