Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename

Conflicts:
	apps/files/js/filelist.js

diff --cc apps/files/js/filelist.js
index 980260928e8279c1e82b6068e2d08e4a6bfb1d41,85bdd509715b66273a0a40ded460854f91a459bd..c33a06bbdc3d2d20db942ee3e1527a20e7f6dd9f
--- 1/apps/files/js/filelist.js
--- 2/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@@ -282,22 -278,21 +279,23 @@@ var FileList=
                $('tr').filterAttr('data-file',name).find('td.filename').draggable('destroy');
                $('tr').filterAttr('data-file',name).remove();
                FileList.updateFileSummary();
 -              if($('tr[data-file]').length==0){
 +              if ( ! $('tr[data-file]').exists() ) {
                        $('#emptycontent').removeClass('hidden');
+                       $('#filescontent th').addClass('hidden');
                }
        },
 -      insertElement:function(name,type,element){
 +      insertElement:function(name, type, element) {
                //find the correct spot to insert the file or folder
                var pos, fileElements=$('tr[data-file][data-type="'+type+'"]:visible');
 -              if(name.localeCompare($(fileElements[0]).attr('data-file'))<0){
 -                      pos=-1;
 -              }else if(name.localeCompare($(fileElements[fileElements.length-1]).attr('data-file'))>0){
 -                      pos=fileElements.length-1;
 -              }else{
 -                      for(pos=0;pos<fileElements.length-1;pos++){
 -                              if(name.localeCompare($(fileElements[pos]).attr('data-file'))>0 && name.localeCompare($(fileElements[pos+1]).attr('data-file'))<0){
 +              if (name.localeCompare($(fileElements[0]).attr('data-file')) < 0) {
 +                      pos = -1;
 +              } else if (name.localeCompare($(fileElements[fileElements.length-1]).attr('data-file')) > 0) {
 +                      pos = fileElements.length - 1;
 +              } else {
 +                      for(pos = 0; pos<fileElements.length-1; pos++) {
 +                              if (name.localeCompare($(fileElements[pos]).attr('data-file')) > 0
 +                                      && name.localeCompare($(fileElements[pos+1]).attr('data-file')) < 0)
 +                              {
                                        break;
                                }
                        }
@@@ -316,14 -311,15 +314,15 @@@
                        $('#fileList').append(element);
                }
                $('#emptycontent').addClass('hidden');
+               $('#filestable th').removeClass('hidden');
                FileList.updateFileSummary();
        },
 -      loadingDone:function(name, id){
 -              var mime, tr=$('tr').filterAttr('data-file',name);
 -              tr.data('loading',false);
 -              mime=tr.data('mime');
 -              tr.attr('data-mime',mime);
 -              if (id != null) {
 +      loadingDone:function(name, id) {
 +              var mime, tr = $('tr[data-file="'+name+'"]');
 +              tr.data('loading', false);
 +              mime = tr.data('mime');
 +              tr.attr('data-mime', mime);
 +              if (id) {
                        tr.attr('data-id', id);
                }
                var path = getPathForPreview(name);
@@@ -551,9 -530,10 +550,10 @@@
                                                procesSelection();
                                                checkTrashStatus();
                                                FileList.updateFileSummary();
+                                               FileList.updateEmptyContent();
                                        } else {
                                                $.each(files,function(index,file) {
 -                                                      var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
 +                                                      var deleteAction = $('tr[data-file="'+files[i]+'"]').children("td.date").children(".action.delete");
                                                        deleteAction.removeClass('progress-icon').addClass('delete-icon');
                                                });
                                        }
@@@ -664,10 -644,17 +664,17 @@@
                        }
                }
        },
 -      updateEmptyContent: function(){
++      updateEmptyContent: function() {
+               var $fileList = $('#fileList');
+               var permissions = $('#permissions').val();
+               var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
 -              $('#emptycontent').toggleClass('hidden', !isCreatable || $fileList.find('tr').length > 0);
 -              $('#filestable th').toggleClass('hidden', $fileList.find('tr').length === 0);
++              $('#emptycontent').toggleClass('hidden', !isCreatable || $fileList.find('tr').exists());
++              $('#filestable th').toggleClass('hidden', $fileList.find('tr').exists() === false);
+       },
 -      showMask: function(){
 +      showMask: function() {
                // in case one was shown before
                var $mask = $('#content .mask');
 -              if ($mask.length){
 +              if ($mask.exists()) {
                        return;
                }
  

diff --cc apps/files/js/files.js
Simple merge