summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/js/filelist.js8
-rw-r--r--apps/files/js/navigation.js17
2 files changed, 25 insertions, 0 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 154209ca975..c6e603e0c94 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -342,6 +342,14 @@
this.$fileList.on('click','td.filename>a.name, td.filesize, td.date', _.bind(this._onClickFile, this));
+ $.event.trigger({type: "droppedOnTrash"});
+
+ var self=this;
+ this.$fileList.on("droppedOnTrash", function (event, filename, directory) {
+ //self.fileActions.triggerAction('Favorite', self.getModelForFile(file), self);
+ self.do_delete(filename, directory)
+ });
+
this.$fileList.on('change', 'td.selection>.selectCheckBox', _.bind(this._onClickFileCheckbox, this));
this.$el.on('show', _.bind(this._onShow, this));
this.$el.on('urlChanged', _.bind(this._onUrlChanged, this));
diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js
index 9fc2180c923..d8b249411f8 100644
--- a/apps/files/js/navigation.js
+++ b/apps/files/js/navigation.js
@@ -64,6 +64,23 @@
_setupEvents: function () {
this.$el.on('click', 'li a', _.bind(this._onClickItem, this))
this.$el.on('click', 'li button', _.bind(this._onClickMenuButton, this));
+
+ $(".nav-trashbin").droppable({
+ drop: function( event, ui ) {
+
+ var $selectedFiles = $(ui.draggable);
+
+ if (ui.helper.find("tr").size()===1) {
+ var $tr = $selectedFiles.closest('tr');
+ $selectedFiles.trigger("droppedOnTrash", $tr.attr("data-file"), $tr.attr('data-dir'));
+ }else{
+ 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"));
+ }
+ }
+ }
+ });
},
/**