summaryrefslogtreecommitdiffstats
path: root/files/js/fileactions.js
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-01-15 00:11:26 +0100
committerRobin Appelman <icewind@owncloud.com>2012-01-15 00:14:42 +0100
commit5cd6e0f4d98b98809eb17366ca90e79b09a05115 (patch)
tree1c12ebe1a75b38df90c9dc772ce74b2f7c28e978 /files/js/fileactions.js
parentd347fe0c53fca52bc1d2b3d171d86494dad7835d (diff)
downloadnextcloud-server-5cd6e0f4d98b98809eb17366ca90e79b09a05115.tar.gz
nextcloud-server-5cd6e0f4d98b98809eb17366ca90e79b09a05115.zip
remove some of the flickering in opera
Diffstat (limited to 'files/js/fileactions.js')
-rw-r--r--files/js/fileactions.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 6f0729e43b6..b5dd3982803 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -66,7 +66,7 @@ FileActions={
if(img.call){
img=img(file);
}
- var html='<a href="#" title="'+name+'" class="action" />';
+ var html='<a href="#" title="'+name+'" class="action" style="display:none" />';
var element=$(html);
if(img){
element.append($('<img src="'+img+'"/>'));
@@ -80,6 +80,7 @@ FileActions={
FileActions.hide();
action(currentFile);
});
+ element.hide();
parent.children('a.name').append(element);
}
}
@@ -88,7 +89,7 @@ FileActions={
if(img.call){
img=img(file);
}
- var html='<a href="#" title="Delete" class="action" />';
+ var html='<a href="#" title="Delete" class="action" style="display:none" />';
var element=$(html);
if(img){
element.append($('<img src="'+img+'"/>'));
@@ -102,10 +103,13 @@ FileActions={
FileActions.hide();
action(currentFile);
});
+ element.hide();
parent.parent().children().last().append(element);
}
- $('#fileList .action').hide();
- $('#fileList .action').fadeIn(200);
+ $('#fileList .action').css('-o-transition-property','none');//temporarly disable
+ $('#fileList .action').fadeIn(200,function(){
+ $('#fileList .action').css('-o-transition-property','opacity');
+ });
return false;
},
hide:function(){