aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/fileactions.js8
-rw-r--r--apps/files/js/files.js2
2 files changed, 7 insertions, 3 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 0c672cd6708..deec640bc12 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -71,7 +71,7 @@ FileActions={
}
var html='<a href="#" class="action" style="display:none">';
if(img) { html+='<img src="'+img+'"/> '; }
- html += name+'</a>';
+ html += t('files', name) +'</a>';
var element=$(html);
element.data('action',name);
element.click(function(event){
@@ -91,7 +91,11 @@ FileActions={
if(img.call){
img=img(file);
}
- var html='<a href="#" original-title="Delete" class="action delete" style="display:none" />';
+ if ($('#dir').val().indexOf('Shared') != -1) {
+ var html='<a href="#" original-title="' + t('files', 'Unshare') + '" class="action delete" style="display:none" />';
+ } else {
+ var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
+ }
var element=$(html);
if(img){
element.append($('<img src="'+img+'"/>'));
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a079deb9539..3ba473e023d 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -452,7 +452,7 @@ $(document).ready(function() {
input.focus();
input.change(function(){
var name=$(this).val();
- if(name.indexOf('/')!=-1){
+ if(type != 'web' && name.indexOf('/')!=-1){
$('#notification').text(t('files','Invalid name, \'/\' is not allowed.'));
$('#notification').fadeIn();
return;