From: Georg Ehrke <developer@georgehrke.com>
Date: Mon, 19 Aug 2013 09:24:17 +0000 (+0200)
Subject: Merge master into oc_preview
X-Git-Tag: v6.0.0alpha2~235^2~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f2702ff1ca45d72300eed5dfa58ebc19aa6e9910;p=nextcloud-server.git

Merge master into oc_preview
---

f2702ff1ca45d72300eed5dfa58ebc19aa6e9910
diff --cc apps/files/js/file-upload.js
index 02e940aa3c4,0eddd7e9cd7..16d96fbb386
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@@ -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();
  	});
-   });
  });
diff --cc apps/files/js/filelist.js
index 10a297ddadb,10801af3ead..41245c00ba6
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@@ -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
diff --cc apps/files/js/files.js
index fd18cf21ee8,4eb949c2eef..f88ecd961b1
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@@ -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);
+ 								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 = $('#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'));