From d40b905f27e2191e644263931f31272d2b3f2f39 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Tue, 23 Aug 2011 11:45:28 +0200
Subject: [PATCH] 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.
---
files/css/files.css | 5 ++---
files/js/fileactions.js | 10 ----------
files/js/filelist.js | 2 +-
files/templates/part.list.php | 1 -
4 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/files/css/files.css b/files/css/files.css
index 9418ec23a6..787efa49e0 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -29,10 +29,9 @@ table { position:relative; top:37px; width:100%; }
tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; height:1em; }
tbody tr.selected { background-color:#eee; }
tbody a { color:#000; }
-span.extention,span.actionHint, td.date { color:#999; }
-span.extention,span.actionHint { opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
+span.extention, td.date { color:#999; }
+span.extention { opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
tr:hover span.extention { opacity:1; }
-tr:hover span.actionHint { opacity:1; }
div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
div.crumb:first-child { padding-left:1.5em; }
div.crumb:last-child { font-weight:bold; }
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 0faecf593b..04943abf74 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 b166d946e1..b89bc9b57b 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);
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index a08b7bebb3..5995976f73 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -16,7 +16,6 @@
<?php echo htmlspecialchars($file['basename']);?><span class='extention'><?php echo $file['extention'];?></span>
<?php endif;?>
</span>
- <span class="actionHint"></span>
</a>
</td>
<td class="filesize" title="<?php echo human_file_size($file['size']); ?>" style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)"><?php echo $simple_file_size; ?></td>
--
GitLab