Merge master into oc_preview

diff --cc apps/files/js/file-upload.js
index c401419fa42d3ce57de71469ccf8375dab6e55bf,f262f11f06539a112f3a13f6656127f1c743a63a..191f7ed66bc456783bd9fe77d281c0a5f8539f88
--- 1/apps/files/js/file-upload.js
--- 2/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@@ -263,8 -270,8 +270,9 @@@ $(document).ready(function() 
                                                                tr.attr('data-mime',result.data.mime);
                                                                tr.attr('data-id', result.data.id);
                                                                tr.find('.filesize').text(humanFileSize(result.data.size));
--                                                              getMimeIcon(result.data.mime,function(path){
--                                                                      tr.find('td.filename').attr('style','background-image:url('+path+')');
++                                                              var path = getPathForPreview(name);
++                                                              lazyLoadPreview(path, result.data.mime, function(previewpath){
++                                                                      tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
                                                                });
                                                        } else {
                                                                OC.dialogs.alert(result.data.message, t('core', 'Error'));
@@@ -325,8 -332,8 +333,9 @@@
                                                var tr=$('tr').filterAttr('data-file',localName);
                                                tr.data('mime',mime).data('id',id);
                                                tr.attr('data-id', id);
--                                              getMimeIcon(mime,function(path){
--                                                      tr.find('td.filename').attr('style','background-image:url('+path+')');
++                                              var path = $('#dir').val()+'/'+localName;
++                                              lazyLoadPreview(path, mime, function(previewpath){
++                                                      tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
                                                });
                                        });
                                        eventSource.listen('error',function(error){

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

diff --cc core/css/styles.css
Simple merge