Merge branch 'master' of github.com:/unclecheese/silverstripe-kickassets

Author: Uncle Cheese

code/KickAssets.php

@@ -120,7 +120,7 @@ public function init() {
 		Requirements::add_i18n_javascript(KICKASSETS_DIR.'/lang');
 		$js = $this->config()->js_file;
 
-    	Requirements::javascript(KICKASSETS_DIR."/javascript/build/$js");
+    		Requirements::javascript(KICKASSETS_DIR."/javascript/build/$js");
 		Requirements::clear_combined_files();		
 	}
 
@@ -166,10 +166,10 @@ public function handleFolderContents(SS_HTTPRequest $r) {
 		);
 
 		$files = File::get()
-					->filter(array(
-						'ParentID' => $folder->ID
-				 	))
-				 	->sort($this->getSortClause($r->getVar('sort')));				 	
+			->filter(array(
+				'ParentID' => $folder->ID
+			))
+			->sort($this->getSortClause($r->getVar('sort')));				 	
 
 		$totalFiles = (int) $files->count();		
 		$files = $files->limit($this->config()->folder_items_limit, $cursor);
@@ -178,18 +178,18 @@ public function handleFolderContents(SS_HTTPRequest $r) {
 			if(!$file->canView()) continue;
 
 			$result['children'][] = ($file instanceof Folder) ? 
-									$this->createFolderJSON($file) : 
-									$this->createFileJSON($file, $folder);			
+						$this->createFolderJSON($file) : 
+						$this->createFileJSON($file, $folder);			
 		}
 
 		$cursor += $files->count();
 		$result['cursor'] = $cursor;
 		$result['has_more'] = ($cursor < $totalFiles);		
 		$result['total_items'] = $totalFiles;
 
-    	return (new SS_HTTPResponse(
-    		Convert::array2json($result), 200
-    	))->addHeader('Content-Type', 'application/json');
+    		return (new SS_HTTPResponse(
+    			Convert::array2json($result), 200
+    		))->addHeader('Content-Type', 'application/json');
 
 	}
 
@@ -203,9 +203,9 @@ public function handleRecentItems(SS_HTTPRequest $r) {
 		$result = array ();
 
 		$fileIDs = File::get()
-				 	->sort('LastEdited', 'DESC')
-				 	->limit($this->config()->recent_items_limit)
-				 	->column('ID');				 	
+			->sort('LastEdited', 'DESC')
+			->limit($this->config()->recent_items_limit)
+			->column('ID');				 	
 
 		if(!empty($fileIDs)) {
 			$files = File::get()
@@ -216,15 +216,15 @@ public function handleRecentItems(SS_HTTPRequest $r) {
 				if(!$file->canView()) continue;
 
 				$result[] = ($file instanceof Folder) ? 
-								$this->createFolderJSON($file) : 
-								$this->createFileJSON($file);
+					$this->createFolderJSON($file) : 
+					$this->createFileJSON($file);
 
 			}
 		}
 
-    	return (new SS_HTTPResponse(
-    		Convert::array2json($result), 200
-    	))->addHeader('Content-Type', 'application/json');
+    		return (new SS_HTTPResponse(
+    			Convert::array2json($result), 200
+    		))->addHeader('Content-Type', 'application/json');
 	}
 
 	/**
@@ -737,4 +737,4 @@ protected function JSONResponse($json = null) {
 			Convert::array2json($json)
 		))->addHeader('Content-Type','application/json');		
 	}
-}
+}