aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/file-upload.js4
-rw-r--r--apps/files/js/filelist.js4
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 3d620c5640b..970aad1f978 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -344,8 +344,12 @@ $(document).ready(function() {
}
var li=form.parent();
form.remove();
+ /* workaround for IE 9&10 click event trap, 2 lines: */
+ $('input').first().focus();
+ $('#content').focus();
li.append('<p>'+li.data('text')+'</p>');
$('#new>a').click();
});
});
+ window.file_upload_param = file_upload_param;
});
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 05e31094502..29be5e0d362 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -147,7 +147,7 @@ var FileList={
$('tr').filterAttr('data-file',name).remove();
FileList.updateFileSummary();
if($('tr[data-file]').length==0){
- $('#emptyfolder').show();
+ $('#emptycontent').show();
}
},
insertElement:function(name,type,element){
@@ -177,7 +177,7 @@ var FileList={
}else{
$('#fileList').append(element);
}
- $('#emptyfolder').hide();
+ $('#emptycontent').hide();
FileList.updateFileSummary();
},
loadingDone:function(name, id){