diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-13 12:10:49 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-13 12:10:49 +0100 |
| commit | 34a7e81ffbd97191a82ddf838d53a826217ede38 (patch) | |
| tree | 25dfdb7c5c1ae4285573c315d60eada924c8fa16 /apps/files | |
| parent | 268a48479dd8cc14eaf3484043cf4857526ccab2 (diff) | |
| parent | ac22cd4ab06f5858fb01cbe5844975f0975ed070 (diff) | |
| download | nextcloud-server-34a7e81ffbd97191a82ddf838d53a826217ede38.tar.gz nextcloud-server-34a7e81ffbd97191a82ddf838d53a826217ede38.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/filelist.js | 16 | ||||
| -rw-r--r-- | apps/files/l10n/es_AR.php | 1 |
2 files changed, 11 insertions, 6 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index ae92a3f1ee1..ac2e0d63588 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -32,14 +32,16 @@ var FileList={ html+='<td class="date"><span class="modified" title="'+formatDate(lastModified)+'" style="color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')">'+relative_modified_date(lastModified.getTime() / 1000)+'</span></td>'; html+='</tr>'; FileList.insertElement(name,'file',$(html).attr('data-file',name)); + var row = $('tr').filterAttr('data-file',name); if(loading){ - $('tr').filterAttr('data-file',name).data('loading',true); + row.data('loading',true); }else{ - $('tr').filterAttr('data-file',name).find('td.filename').draggable(dragOptions); + row.find('td.filename').draggable(dragOptions); } if (hidden) { - $('tr').filterAttr('data-file', name).hide(); + row.hide(); } + FileActions.display(row.find('td.filename')); }, addDir:function(name,size,lastModified,hidden){ var html, td, link_elem, sizeColor, lastModifiedTime, modifiedColor; @@ -66,11 +68,13 @@ var FileList={ td.append($('<span></span>').attr({ "class": "modified", "title": formatDate(lastModified), "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')' }).text( relative_modified_date(lastModified.getTime() / 1000) )); html.append(td); FileList.insertElement(name,'dir',html); - $('tr').filterAttr('data-file',name).find('td.filename').draggable(dragOptions); - $('tr').filterAttr('data-file',name).find('td.filename').droppable(folderDropOptions); + var row = $('tr').filterAttr('data-file',name); + row.find('td.filename').draggable(dragOptions); + row.find('td.filename').droppable(folderDropOptions); if (hidden) { - $('tr').filterAttr('data-file', name).hide(); + row.hide(); } + FileActions.display(row.find('td.filename')); }, refresh:function(data) { var result = jQuery.parseJSON(data.responseText); diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index a4e29dfec27..074e186b435 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -48,6 +48,7 @@ "New" => "Nuevo", "Text file" => "Archivo de texto", "Folder" => "Carpeta", +"From link" => "Desde enlace", "Upload" => "Subir", "Cancel upload" => "Cancelar subida", "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!", |