aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js20
-rw-r--r--apps/files/js/files.js35
2 files changed, 30 insertions, 25 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cc107656da8..f5f3f3ba0c6 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -35,7 +35,7 @@ var FileList={
if(extension){
name_span.append($('<span></span>').addClass('extension').text(extension));
}
- //dirs can show the number of uploaded files
+ //dirs can show the number of uploaded files
if (type == 'dir') {
link_elem.append($('<span></span>').attr({
'class': 'uploadtext',
@@ -44,7 +44,7 @@ var FileList={
}
td.append(link_elem);
tr.append(td);
-
+
//size column
if(size!=t('files', 'Pending')){
simpleSize=simpleFileSize(size);
@@ -59,7 +59,7 @@ var FileList={
"style": 'color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')'
}).text(simpleSize);
tr.append(td);
-
+
// date column
var modifiedColor = Math.round((Math.round((new Date()).getTime() / 1000)-lastModifiedTime)/60/60/24*5);
td = $('<td></td>').attr({ "class": "date" });
@@ -87,7 +87,7 @@ var FileList={
lastModified,
$('#permissions').val()
);
-
+
FileList.insertElement(name, 'file', tr.attr('data-file',name));
var row = $('tr').filterAttr('data-file',name);
if(loading){
@@ -101,7 +101,7 @@ var FileList={
FileActions.display(row.find('td.filename'));
},
addDir:function(name,size,lastModified,hidden){
-
+
var tr = this.createRow(
'dir',
name,
@@ -111,7 +111,7 @@ var FileList={
lastModified,
$('#permissions').val()
);
-
+
FileList.insertElement(name,'dir',tr);
var row = $('tr').filterAttr('data-file',name);
row.find('td.filename').draggable(dragOptions);
@@ -315,8 +315,8 @@ var FileList={
do_delete:function(files){
if(files.substr){
files=[files];
- }
- for (var i in files) {
+ }
+ for (var i=0; i<files.length; i++) {
var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
var oldHTML = deleteAction[0].outerHTML;
var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
@@ -334,7 +334,7 @@ var FileList={
if (result.status == 'success') {
$.each(files,function(index,file){
var files = $('tr').filterAttr('data-file',file);
- files.hide();
+ files.remove();
files.find('input[type="checkbox"]').removeAttr('checked');
files.removeClass('selected');
});
@@ -344,7 +344,7 @@ var FileList={
var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
deleteAction[0].outerHTML = oldHTML;
});
- }
+ }
});
}
};
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 918182162d4..464f7703685 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -114,7 +114,7 @@ $(document).ready(function() {
$(this).parent().children('#file_upload_start').trigger('click');
return false;
});
-
+
// Show trash bin
$('#trash a').live('click', function() {
window.location=OC.filePath('files_trashbin', '', 'index.php');
@@ -162,9 +162,10 @@ $(document).ready(function() {
var tr=$('tr').filterAttr('data-file',filename);
var renaming=tr.data('renaming');
if(!renaming && !FileList.isLoading(filename)){
- var mime=$(this).parent().parent().data('mime');
- var type=$(this).parent().parent().data('type');
- var permissions = $(this).parent().parent().data('permissions');
+ FileActions.currentFile = $(this).parent();
+ var mime=FileActions.getCurrentMimeType();
+ var type=FileActions.getCurrentType();
+ var permissions = FileActions.getCurrentPermissions();
var action=FileActions.getDefault(mime,type, permissions);
if(action){
event.preventDefault();
@@ -523,7 +524,7 @@ $(document).ready(function() {
crumb.text(text);
}
- $(window).click(function(){
+ $(document).click(function(){
$('#new>ul').hide();
$('#new').removeClass('active');
$('#new li').each(function(i,element){
@@ -594,7 +595,7 @@ $(document).ready(function() {
var date=new Date();
FileList.addFile(name,0,date,false,hidden);
var tr=$('tr').filterAttr('data-file',name);
- tr.data('mime','text/plain').data('id',result.data.id);
+ tr.attr('data-mime','text/plain');
tr.attr('data-id', result.data.id);
getMimeIcon('text/plain',function(path){
tr.find('td.filename').attr('style','background-image:url('+path+')');
@@ -816,26 +817,26 @@ var createDragShadow = function(event){
//select dragged file
$(event.target).parents('tr').find('td input:first').prop('checked',true);
}
-
+
var selectedFiles = getSelectedFiles();
-
+
if (!isDragSelected && selectedFiles.length == 1) {
//revert the selection
$(event.target).parents('tr').find('td input:first').prop('checked',false);
}
-
+
//also update class when we dragged more than one file
if (selectedFiles.length > 1) {
$(event.target).parents('tr').addClass('selected');
}
-
+
// build dragshadow
var dragshadow = $('<table class="dragshadow"></table>');
var tbody = $('<tbody></tbody>');
dragshadow.append(tbody);
-
+
var dir=$('#dir').val();
-
+
$(selectedFiles).each(function(i,elem){
var newtr = $('<tr data-dir="'+dir+'" data-filename="'+elem.name+'">'
+'<td class="filename">'+elem.name+'</td><td class="size">'+humanFileSize(elem.size)+'</td>'
@@ -849,7 +850,7 @@ var createDragShadow = function(event){
});
}
});
-
+
return dragshadow;
}
@@ -862,6 +863,10 @@ var dragOptions={
$('#fileList tr td.filename').addClass('ui-draggable');
}
}
+// sane browsers support using the distance option
+if ( ! $.browser.msie) {
+ dragOptions['distance'] = 20;
+}
var folderDropOptions={
drop: function( event, ui ) {
@@ -869,9 +874,9 @@ var folderDropOptions={
if ($(event.target).parents('tr').find('td input:first').prop('checked') === true) {
return false;
}
-
+
var target=$.trim($(this).find('.nametext').text());
-
+
var files = ui.helper.find('tr');
$(files).each(function(i,row){
var dir = $(row).data('dir');
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-24 14:07:02 +0000