diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-09-12 21:43:35 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-09-12 21:43:35 +0200 |
| commit | c9d26631592ba58d8026a14e7f637cfe835fa15d (patch) | |
| tree | b6bc91006e0207a2e2b26ba5d1205853e0ca7fda /apps/files/js | |
| parent | b9167196fb331d7197210e4a130e03d32d839b8a (diff) | |
| parent | c7ca86799b2608609ead7ecd2d84d0bbd47c6548 (diff) | |
| download | nextcloud-server-c9d26631592ba58d8026a14e7f637cfe835fa15d.tar.gz nextcloud-server-c9d26631592ba58d8026a14e7f637cfe835fa15d.zip | |
Merge branch 'master' into fileapi-foreward
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/file-upload.js | 4 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 4 |
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){ |