diff options
Diffstat (limited to 'files/js')
| -rw-r--r-- | files/js/fileactions.js | 10 | ||||
| -rw-r--r-- | files/js/filelist.js | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/files/js/fileactions.js b/files/js/fileactions.js index 04943abf74a..0faecf593b8 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -82,6 +82,11 @@ FileActions={ }); parent.children('a.name').append(element); } + element.hover(function(e){ + $('span.actionHint').text($(this).data('action')); + }, function(e){ + $('span.actionHint').text(''); + }); } if(actions['Delete']){ var img=FileActions.icons['Delete']; @@ -136,6 +141,11 @@ FileActions.register('all','Rename',function(){return OC.imagePath('core','actio FileList.rename(filename); }); +// preparation for encryption embeeding in user interface +//FileActions.register('all', 'Encrypt', function(){return OC.imagePath('core', 'actions/play-add')},function(filename){ +// alert(filename); +//}); + //FileActions.setDefault('all','Download'); FileActions.register('dir','Open','',function(filename){ diff --git a/files/js/filelist.js b/files/js/filelist.js index b89bc9b57b6..b166d946e16 100644 --- a/files/js/filelist.js +++ b/files/js/filelist.js @@ -50,7 +50,7 @@ FileList={ html+='<td class="filesize" title="'+humanFileSize(size)+'" style="color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')">'+simpleSize+'</td>'; html+='<td class="date" title="'+formatDate(lastModified)+'" style="color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')">'+relative_modified_date(lastModified.getTime() / 1000)+'</td>'; html+='</tr>'; - + FileList.insertElement(name,'dir',$(html)); $('tr[data-file="'+name+'"] td.filename').draggable(dragOptions); $('tr[data-file="'+name+'"] td.filename').droppable(folderDropOptions); |