mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5412 from owncloud/fix_5141 

give getSelectedFilesTrash() a unique name for the trash.js
This commit is contained in:
Björn Schießle 2013-10-18 03:51:54 -07:00
parent 33cf4708d5 1c611a3dfb
commit c954b04973
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files/js/files.js
View File

@ -301,7 +301,7 @@ $(document).ready(function() {
}); });
$('.download').click('click',function(event) { $('.download').click('click',function(event) {
var files=getSelectedFiles('name'); var files=getSelectedFilesTrash('name');
var fileslist = JSON.stringify(files); var fileslist = JSON.stringify(files);
var dir=$('#dir').val()||'/'; var dir=$('#dir').val()||'/';
OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.')); OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.'));
@ -315,7 +315,7 @@ $(document).ready(function() {
}); });
$('.delete-selected').click(function(event) { $('.delete-selected').click(function(event) {
var files=getSelectedFiles('name'); var files=getSelectedFilesTrash('name');
event.preventDefault(); event.preventDefault();
FileList.do_delete(files); FileList.do_delete(files);
return false; return false;
@ -433,7 +433,7 @@ var createDragShadow = function(event){
$(event.target).parents('tr').find('td input:first').prop('checked',true); $(event.target).parents('tr').find('td input:first').prop('checked',true);
} }
var selectedFiles = getSelectedFiles(); var selectedFiles = getSelectedFilesTrash();
if (!isDragSelected && selectedFiles.length == 1) { if (!isDragSelected && selectedFiles.length == 1) {
//revert the selection //revert the selection
@ -562,7 +562,7 @@ var crumbDropOptions={
} }
function procesSelection(){ function procesSelection(){
var selected=getSelectedFiles(); var selected=getSelectedFilesTrash();
var selectedFiles=selected.filter(function(el){return el.type=='file'}); var selectedFiles=selected.filter(function(el){return el.type=='file'});
var selectedFolders=selected.filter(function(el){return el.type=='dir'}); var selectedFolders=selected.filter(function(el){return el.type=='dir'});
if(selectedFiles.length==0 && selectedFolders.length==0) { if(selectedFiles.length==0 && selectedFolders.length==0) {
@ -607,7 +607,7 @@ function procesSelection(){
* if property is set, an array with that property for each file is returnd * if property is set, an array with that property for each file is returnd
* if it's ommited an array of objects with all properties is returned * if it's ommited an array of objects with all properties is returned
*/ */
function getSelectedFiles(property){ function getSelectedFilesTrash(property){
var elements=$('td.filename input:checkbox:checked').parent().parent(); var elements=$('td.filename input:checkbox:checked').parent().parent();
var files=[]; var files=[];
elements.each(function(i,element){ elements.each(function(i,element){