aboutsummaryrefslogtreecommitdiffstats
path: root/files/js
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-08-23 11:45:28 +0200
committerJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-08-23 11:45:28 +0200
commitd40b905f27e2191e644263931f31272d2b3f2f39 (patch)
treef5bee746c1d5d34c80dc6d0852f36a986343ff04 /files/js
parentf5cef2fcbf7b0626d7e2c02727e3d51987beec40 (diff)
downloadnextcloud-server-d40b905f27e2191e644263931f31272d2b3f2f39.tar.gz
nextcloud-server-d40b905f27e2191e644263931f31272d2b3f2f39.zip
Revert "hints for file actions"
1) Please test in Firefox 2) File actions should be refactored first, to be shown/hidden via CSS, not via JavaScript This reverts commit e78d1dd676a12e0a26960f0bf131975c7559298a.
Diffstat (limited to 'files/js')
-rw-r--r--files/js/fileactions.js10
-rw-r--r--files/js/filelist.js2
2 files changed, 1 insertions, 11 deletions
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 0faecf593b8..04943abf74a 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -82,11 +82,6 @@ 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'];
@@ -141,11 +136,6 @@ 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 b166d946e16..b89bc9b57b6 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);