extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drag & drop files from user's system onto nextmatch row uploads into filemanager

Browse Source
This commit is contained in:
Nathan Gray 2013-08-27 20:40:15 +00:00
parent 36021f5d13
commit f5b5b60636
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
filemanager/inc/class.filemanager_ui.inc.php
View File

@ -447,6 +447,7 @@ class filemanager_ui
'3' => 'Show hidden files', '3' => 'Show hidden files',
'' => 'Files from subdirectories', '' => 'Files from subdirectories',
); );
$tpl->setElementAttribute('nm', 'onfiledrop', 'app.filemanager.filedrop');
$tpl->setElementAttribute('nm[upload]', 'onFinish', 'app.filemanager.upload'); $tpl->setElementAttribute('nm[upload]', 'onFinish', 'app.filemanager.upload');
$tpl->setElementAttribute('nm[upload]', 'multiple', true); $tpl->setElementAttribute('nm[upload]', 'multiple', true);

41
filemanager/js/app.js
View File

@ -180,13 +180,18 @@ app.filemanager = AppJS.extend(
* *
* @param _event * @param _event
* @param _file_count * @param _file_count
* @param {string} [_path=current directory] Where the file is uploaded to.
*/ */
upload: function(_event, _file_count) upload: function(_event, _file_count, _path)
{ {
if(typeof _path == 'undefined')
{
_path = this.get_path();
}
if (_file_count && !jQuery.isEmptyObject(_event.data.getValue())) if (_file_count && !jQuery.isEmptyObject(_event.data.getValue()))
{ {
var widget = _event.data; var widget = _event.data;
var request = new egw_json_request('filemanager_ui::ajax_action', ['upload', widget.getValue(), this.get_path()], this); var request = new egw_json_request('filemanager_ui::ajax_action', ['upload', widget.getValue(), _path], this);
widget.set_value(''); widget.set_value('');
request.sendRequest(false, this._upload_callback, this); request.sendRequest(false, this._upload_callback, this);
} }
@ -494,7 +499,37 @@ app.filemanager = AppJS.extend(
this._do_action(_action.id == "file_drop_move" ? 'move' : 'copy', src, false, dst); this._do_action(_action.id == "file_drop_move" ? 'move' : 'copy', src, false, dst);
}, },
/**
* Handle a native / HTML5 file drop from system
*
* This is a callback from nextmatch to prevent the default link action, and just upload instead.
*
* @param {string} row_uid UID of the row the files were dropped on
* @param {File[]} Array of Files
*/
filedrop: function(row_uid, files)
{
var self = this;
var data = egw.dataGetUIDdata(row_uid);
var path = data.data.mime == "httpd/unix-directory" ? data.data.path : this.get_path();
var widget = this.et2.getWidgetById('upload');
// Override finish to specify a potentially different path
var old_onfinish = widget.options.onFinish;
widget.options.onFinish = function(_event, _file_count) {
widget.options.onFinish = old_onfinish;
self.upload(_event, _file_count, path);
}
// This triggers the upload
widget.set_value(files);
// Return false to prevent the link
return false;
},
/** /**
* Get drag helper, called on drag start * Get drag helper, called on drag start
* *