aboutsummaryrefslogtreecommitdiffstats
path: root/files/js
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-04-15 14:28:31 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-04-15 14:28:31 +0200
commit8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0 (patch)
tree081c20bfc9a165b10fbc2cbb64a07040ad87027d /files/js
parente292b1fcdbe15d3a048c89f1825cb9ae8831edbb (diff)
parent897261daf48a0b60227c7fce248cfd1c56fe68b1 (diff)
downloadnextcloud-server-8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0.tar.gz
nextcloud-server-8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0.zip
Merge branch 'master' into calendar_sharing
Diffstat (limited to 'files/js')
-rw-r--r--files/js/fileactions.js12
-rw-r--r--files/js/filelist.js10
2 files changed, 11 insertions, 11 deletions
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 60c4fadedd0..5c6dc65d49d 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -59,6 +59,7 @@ FileActions={
if($('tr').filterAttr('data-file',file).data('renaming')){
return;
}
+ parent.children('a.name').append('<span class="fileactions" />');
var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
for(name in actions){
if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){
@@ -66,11 +67,10 @@ FileActions={
if(img.call){
img=img(file);
}
- var html='<a href="#" original-title="'+name+'" class="action" style="display:none" />';
+ var html='<a href="#" class="action" style="display:none">';
+ if(img) { html+='<img src="'+img+'"/> '; }
+ html += name+'</a>';
var element=$(html);
- if(img){
- element.append($('<img src="'+img+'"/>'));
- }
element.data('action',name);
element.click(function(event){
event.stopPropagation();
@@ -81,7 +81,7 @@ FileActions={
action(currentFile);
});
element.hide();
- parent.children('a.name').append(element);
+ parent.find('a.name>span.fileactions').append(element);
}
}
if(actions['Delete']){
@@ -113,7 +113,7 @@ FileActions={
return false;
},
hide:function(){
- $('#fileList .action').fadeOut(200,function(){
+ $('#fileList span.fileactions').fadeOut(200,function(){
$(this).remove();
});
},
diff --git a/files/js/filelist.js b/files/js/filelist.js
index 35847e06dfe..533e03b43cd 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -7,15 +7,15 @@ FileList={
var html='<tr data-type="file" data-size="'+size+'">';
if(name.indexOf('.')!=-1){
var basename=name.substr(0,name.lastIndexOf('.'));
- var extention=name.substr(name.lastIndexOf('.'));
+ var extension=name.substr(name.lastIndexOf('.'));
}else{
var basename=name;
- var extention=false;
+ var extension=false;
}
html+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />';
html+='<a class="name" href="download.php?file='+$('#dir').val()+'/'+name+'"><span class="nametext">'+basename
- if(extention){
- html+='<span class="extention">'+extention+'</span>';
+ if(extension){
+ html+='<span class="extension">'+extension+'</span>';
}
html+='</span></a></td>';
if(size!='Pending'){
@@ -147,7 +147,7 @@ FileList={
span.text(basename);
td.children('a.name').append(span);
if(newname.indexOf('.')>0){
- span.append($('<span class="extention">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
+ span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
}
$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(){
tr.data('renaming',false);