]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge master into oc_preview
authorGeorg Ehrke <developer@georgehrke.com>
Mon, 19 Aug 2013 09:24:17 +0000 (11:24 +0200)
committerGeorg Ehrke <developer@georgehrke.com>
Mon, 19 Aug 2013 09:24:17 +0000 (11:24 +0200)
12 files changed:
1  2 
apps/files/css/files.css
apps/files/index.php
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/index.php
apps/files_sharing/public.php
apps/files_trashbin/lib/trash.php
core/css/styles.css
core/routes.php
lib/helper.php
lib/util.php

Simple merge
Simple merge
index 02e940aa3c46dcf27ef223dac0c75a6b4241aa5c,0eddd7e9cd7179a117fe8a7489ff4cbfc9a2a3c9..16d96fbb386548006342015a7d1e9a85ebe4f7c1
@@@ -149,195 -149,197 +149,197 @@@ $(document).ready(function() 
  
  
  
-   if ( document.getElementById('data-upload-form') ) {
-       $(file_upload_handler);
-   }
-   $.assocArraySize = function(obj) {
-       // http://stackoverflow.com/a/6700/11236
-       var size = 0, key;
-       for (key in obj) {
-         if (obj.hasOwnProperty(key)) size++;
+       if ( document.getElementById('data-upload-form') ) {
+               $(file_upload_handler);
        }
-       return size;
-   };
-   // warn user not to leave the page while upload is in progress
-   $(window).bind('beforeunload', function(e) {
-       if ($.assocArraySize(uploadingFiles) > 0)
-         return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
-   });
+       $.assocArraySize = function(obj) {
+               // http://stackoverflow.com/a/6700/11236
+               var size = 0, key;
+               for (key in obj) {
+                       if (obj.hasOwnProperty(key)) size++;
+               }
+               return size;
+       };
  
-   //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
-   if(navigator.userAgent.search(/konqueror/i)==-1){
-       $('#file_upload_start').attr('multiple','multiple')
-   }
+       // warn user not to leave the page while upload is in progress
+       $(window).bind('beforeunload', function(e) {
+               if ($.assocArraySize(uploadingFiles) > 0)
+                       return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
+       });
  
-   //if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
-   var crumb=$('div.crumb').first();
-   while($('div.controls').height()>40 && crumb.next('div.crumb').length>0){
-       crumb.children('a').text('...');
-       crumb=crumb.next('div.crumb');
-   }
-   //if that isn't enough, start removing items from the breacrumb except for the current folder and it's parent
-   var crumb=$('div.crumb').first();
-   var next=crumb.next('div.crumb');
-   while($('div.controls').height()>40 && next.next('div.crumb').length>0){
-       crumb.remove();
-       crumb=next;
-       next=crumb.next('div.crumb');
-   }
-   //still not enough, start shorting down the current folder name
-   var crumb=$('div.crumb>a').last();
-   while($('div.controls').height()>40 && crumb.text().length>6){
-       var text=crumb.text()
-       text=text.substr(0,text.length-6)+'...';
-       crumb.text(text);
-   }
+       //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
+       if(navigator.userAgent.search(/konqueror/i)==-1){
+               $('#file_upload_start').attr('multiple','multiple')
+       }
  
-   $(document).click(function(){
-       $('#new>ul').hide();
-       $('#new').removeClass('active');
-       $('#new li').each(function(i,element){
-         if($(element).children('p').length==0){
-               $(element).children('form').remove();
-               $(element).append('<p>'+$(element).data('text')+'</p>');
-         }
-       });
-   });
-   $('#new li').click(function(){
-       if($(this).children('p').length==0){
-         return;
+       //if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
+       var crumb=$('div.crumb').first();
+       while($('div.controls').height()>40 && crumb.next('div.crumb').length>0){
+               crumb.children('a').text('...');
+               crumb=crumb.next('div.crumb');
+       }
+       //if that isn't enough, start removing items from the breacrumb except for the current folder and it's parent
+       var crumb=$('div.crumb').first();
+       var next=crumb.next('div.crumb');
+       while($('div.controls').height()>40 && next.next('div.crumb').length>0){
+               crumb.remove();
+               crumb=next;
+               next=crumb.next('div.crumb');
+       }
+       //still not enough, start shorting down the current folder name
+       var crumb=$('div.crumb>a').last();
+       while($('div.controls').height()>40 && crumb.text().length>6){
+               var text=crumb.text()
+               text=text.substr(0,text.length-6)+'...';
+               crumb.text(text);
        }
  
-       $('#new li').each(function(i,element){
-         if($(element).children('p').length==0){
-               $(element).children('form').remove();
-               $(element).append('<p>'+$(element).data('text')+'</p>');
-         }
+       $(document).click(function(){
+               $('#new>ul').hide();
+               $('#new').removeClass('active');
+               $('#new li').each(function(i,element){
+                       if($(element).children('p').length==0){
+                               $(element).children('form').remove();
+                               $(element).append('<p>'+$(element).data('text')+'</p>');
+                       }
+               });
        });
+       $('#new li').click(function(){
+               if($(this).children('p').length==0){
+                       return;
+               }
  
-       var type=$(this).data('type');
-       var text=$(this).children('p').text();
-       $(this).data('text',text);
-       $(this).children('p').remove();
-       var form=$('<form></form>');
-       var input=$('<input type="text">');
-       form.append(input);
-       $(this).append(form);
-       input.focus();
-       form.submit(function(event){
-         event.stopPropagation();
-         event.preventDefault();
-         var newname=input.val();
-         if(type == 'web' && newname.length == 0) {
-               OC.Notification.show(t('files', 'URL cannot be empty.'));
-               return false;
-         } else if (type != 'web' && !Files.isFileNameValid(newname)) {
-               return false;
-         } else if( type == 'folder' && $('#dir').val() == '/' && newname == 'Shared') {
-               OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by ownCloud'));
-               return false;
-         }
-         if (FileList.lastAction) {
-               FileList.lastAction();
-         }
-         var name = getUniqueName(newname);
-         if (newname != name) {
-               FileList.checkName(name, newname, true);
-               var hidden = true;
-         } else {
-               var hidden = false;
-         }
-         switch(type){
-         case 'file':
-               $.post(
-                 OC.filePath('files','ajax','newfile.php'),
-                 {dir:$('#dir').val(),filename:name},
-                 function(result){
-                       if (result.status == 'success') {
-                         var date=new Date();
-                         FileList.addFile(name,0,date,false,hidden);
-                         var tr=$('tr').filterAttr('data-file',name);
-                         tr.attr('data-mime',result.data.mime);
-                         tr.attr('data-id', result.data.id);
-                         getMimeIcon(result.data.mime,function(path){
-                       tr.find('td.filename').attr('style','background-image:url('+path+')');
-                         });
-                       } else {
-                         OC.dialogs.alert(result.data.message, t('core', 'Error'));
+               $('#new li').each(function(i,element){
+                       if($(element).children('p').length==0){
+                               $(element).children('form').remove();
+                               $(element).append('<p>'+$(element).data('text')+'</p>');
+                       }
+               });
+               var type=$(this).data('type');
+               var text=$(this).children('p').text();
+               $(this).data('text',text);
+               $(this).children('p').remove();
+               var form=$('<form></form>');
 -              var input=$('<input>');
++              var input=$('<input type="text">');
+               form.append(input);
+               $(this).append(form);
+               input.focus();
+               form.submit(function(event){
+                       event.stopPropagation();
+                       event.preventDefault();
+                       var newname=input.val();
+                       if(type == 'web' && newname.length == 0) {
+                               OC.Notification.show(t('files', 'URL cannot be empty.'));
+                               return false;
+                       } else if (type != 'web' && !Files.isFileNameValid(newname)) {
+                               return false;
+                       } else if( type == 'folder' && $('#dir').val() == '/' && newname == 'Shared') {
+                               OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by ownCloud'));
+                               return false;
+                       }
+                       if (FileList.lastAction) {
+                               FileList.lastAction();
                        }
-                 }
-               );
-               break;
-         case 'folder':
-               $.post(
-                 OC.filePath('files','ajax','newfolder.php'),
-                 {dir:$('#dir').val(),foldername:name},
-                 function(result){
-                       if (result.status == 'success') {
-                         var date=new Date();
-                         FileList.addDir(name,0,date,hidden);
-                         var tr=$('tr').filterAttr('data-file',name);
-                         tr.attr('data-id', result.data.id);
+                       var name = getUniqueName(newname);
+                       if (newname != name) {
+                               FileList.checkName(name, newname, true);
+                               var hidden = true;
                        } else {
-                         OC.dialogs.alert(result.data.message, t('core', 'Error'));
+                               var hidden = false;
                        }
-                 }
-               );
-               break;
-         case 'web':
-               if(name.substr(0,8)!='https://' && name.substr(0,7)!='http://'){
-                 name='http://'+name;
-               }
-               var localName=name;
-               if(localName.substr(localName.length-1,1)=='/'){//strip /
-                 localName=localName.substr(0,localName.length-1)
-               }
-               if(localName.indexOf('/')){//use last part of url
-                 localName=localName.split('/').pop();
-               } else { //or the domain
-                 localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
-               }
-               localName = getUniqueName(localName);
-               //IE < 10 does not fire the necessary events for the progress bar.
-               if($('html.lte9').length > 0) {
-               } else {
-                 $('#uploadprogressbar').progressbar({value:0});
-                 $('#uploadprogressbar').fadeIn();
-               }
+                       switch(type){
+                               case 'file':
+                                       $.post(
+                                               OC.filePath('files','ajax','newfile.php'),
+                                               {dir:$('#dir').val(),filename:name},
+                                               function(result){
+                                                       if (result.status == 'success') {
+                                                               var date=new Date();
+                                                               FileList.addFile(name,0,date,false,hidden);
+                                                               var tr=$('tr').filterAttr('data-file',name);
+                                                               tr.attr('data-size',result.data.size);
+                                                               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+')');
+                                                               });
+                                                       } else {
+                                                               OC.dialogs.alert(result.data.message, t('core', 'Error'));
+                                                       }
+                                               }
+                                       );
+                                       break;
+                               case 'folder':
+                                       $.post(
+                                               OC.filePath('files','ajax','newfolder.php'),
+                                               {dir:$('#dir').val(),foldername:name},
+                                               function(result){
+                                                       if (result.status == 'success') {
+                                                               var date=new Date();
+                                                               FileList.addDir(name,0,date,hidden);
+                                                               var tr=$('tr').filterAttr('data-file',name);
+                                                               tr.attr('data-id', result.data.id);
+                                                       } else {
+                                                               OC.dialogs.alert(result.data.message, t('core', 'Error'));
+                                                       }
+                                               }
+                                       );
+                                       break;
+                               case 'web':
+                                       if(name.substr(0,8)!='https://' && name.substr(0,7)!='http://'){
+                                               name='http://'+name;
+                                       }
+                                       var localName=name;
+                                       if(localName.substr(localName.length-1,1)=='/'){//strip /
+                                               localName=localName.substr(0,localName.length-1)
+                                       }
+                                       if(localName.indexOf('/')){//use last part of url
+                                               localName=localName.split('/').pop();
+                                       } else { //or the domain
+                                               localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
+                                       }
+                                       localName = getUniqueName(localName);
+                                       //IE < 10 does not fire the necessary events for the progress bar.
+                                       if($('html.lte9').length > 0) {
+                                       } else {
+                                               $('#uploadprogressbar').progressbar({value:0});
+                                               $('#uploadprogressbar').fadeIn();
+                                       }
  
-               var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
-               eventSource.listen('progress',function(progress){
-                 //IE < 10 does not fire the necessary events for the progress bar.
-                 if($('html.lte9').length > 0) {
-                 } else {
-                       $('#uploadprogressbar').progressbar('value',progress);
-                 }
-               });
-               eventSource.listen('success',function(data){
-                 var mime=data.mime;
-                 var size=data.size;
-                 var id=data.id;
-                 $('#uploadprogressbar').fadeOut();
-                 var date=new Date();
-                 FileList.addFile(localName,size,date,false,hidden);
-                 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+')');
-                 });
-               });
-               eventSource.listen('error',function(error){
-                 $('#uploadprogressbar').fadeOut();
-                 alert(error);
+                                       var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
+                                       eventSource.listen('progress',function(progress){
+                                               //IE < 10 does not fire the necessary events for the progress bar.
+                                               if($('html.lte9').length > 0) {
+                                               } else {
+                                                       $('#uploadprogressbar').progressbar('value',progress);
+                                               }
+                                       });
+                                       eventSource.listen('success',function(data){
+                                               var mime=data.mime;
+                                               var size=data.size;
+                                               var id=data.id;
+                                               $('#uploadprogressbar').fadeOut();
+                                               var date=new Date();
+                                               FileList.addFile(localName,size,date,false,hidden);
+                                               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+')');
+                                               });
+                                       });
+                                       eventSource.listen('error',function(error){
+                                               $('#uploadprogressbar').fadeOut();
+                                               alert(error);
+                                       });
+                                       break;
+                       }
+                       var li=form.parent();
+                       form.remove();
+                       li.append('<p>'+li.data('text')+'</p>');
+                       $('#new>a').click();
                });
-               break;
-         }
-         var li=form.parent();
-         form.remove();
-         li.append('<p>'+li.data('text')+'</p>');
-         $('#new>a').click();
        });
-   });
  });
index 10a297ddadbc2ebc79394a2473bc52617f2cba3d,10801af3eadd7fffd28d021d2c6b5bd1dd35b7bf..41245c00ba652e463cab0505664f5f04a4f2652b
@@@ -15,9 -15,9 +15,9 @@@ var FileList=
                // filename td
                td = $('<td></td>').attr({
                        "class": "filename",
-                       "style": 'background-image:url('+iconurl+')'
+                       "style": 'background-image:url('+iconurl+'); background-size: 16px;'
                });
 -              td.append('<input type="checkbox" />');
 +              td.append('<input id="select-"'+name+'" type="checkbox" /><label for="select-"'+name+'"></label>');
                var link_elem = $('<a></a>').attr({
                        "class": "name",
                        "href": linktarget
index fd18cf21ee87857cf636889b844424567f522d45,4eb949c2eefff4faa854115b2501c85fe12c7f7c..f88ecd961b15676da79f8933589b3c5a6ff38bf7
@@@ -365,10 -379,11 +379,12 @@@ $(document).ready(function() 
                                                                FileList.addFile(name,0,date,false,hidden);
                                                                var tr=$('tr').filterAttr('data-file',name);
                                                                tr.attr('data-mime',result.data.mime);
+                                                               tr.attr('data-size',result.data.size);
                                                                tr.attr('data-id', result.data.id);
 -                                                              getMimeIcon(result.data.mime,function(path){
 -                                                                      tr.find('td.filename').attr('style','background-image:url('+path+')');
+                                                               tr.find('.filesize').text(humanFileSize(result.data.size));
 +                                                              var path = $('#dir').val() + '/' + 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'));
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc core/routes.php
Simple merge
diff --cc lib/helper.php
Simple merge
diff --cc lib/util.php
Simple merge