Merge branch 'master' into display-share-owner-master

Conflicts:
	apps/files_sharing/lib/cache.php

1 files changed, 11 insertions, 8 deletions

diff --git a/apps/files/js/admin.js b/apps/files/js/admin.js
index f735079fcbe..842b73c0cae 100644
--- a/apps/files/js/admin.js
+++ b/apps/files/js/admin.js
@@ -8,19 +8,22 @@
  *
  */
 
-function switchPublicFolder()
-{
+function switchPublicFolder() {
 	var publicEnable = $('#publicEnable').is(':checked');
-	var sharingaimGroup = $('input:radio[name=sharingaim]'); //find all radiobuttons of that group
+	// find all radiobuttons of that group
+	var sharingaimGroup = $('input:radio[name=sharingaim]');
 	$.each(sharingaimGroup, function(index, sharingaimItem) {
-		sharingaimItem.disabled = !publicEnable;	 //set all buttons to the correct state
+		// set all buttons to the correct state
+		sharingaimItem.disabled = !publicEnable;
 	});
 }
 
-$(document).ready(function(){
-	switchPublicFolder(); // Execute the function after loading DOM tree
-	$('#publicEnable').click(function(){
-		switchPublicFolder(); // To get rid of onClick()
+$(document).ready(function() {
+	// Execute the function after loading DOM tree
+	switchPublicFolder();
+	$('#publicEnable').click(function() {
+		// To get rid of onClick()
+		switchPublicFolder();
 	});
 
 	$('#allowZipDownload').bind('change', function() {