Merge pull request #10 from shaffe-fr/patch-1

Fix JavaScript error on combined files by adding a semicolon at the end of every combined JavaScript file.

libraries/carabiner.php

@@ -868,23 +868,23 @@ private function _combine($flag, $files, $filename)
 	{
 
 		$file_data = '';
-
+
+		$suffix = $flag == 'js' ? ';' : '';		
 		$path = ($flag == 'css') ? $this->style_path : $this->script_path;
 		$minify = ($flag == 'css') ? $this->minify_css : $this->minify_js;
-
-
+
 		foreach($files as $file):
 
 			$v = (isset($file['prod']) ) ? 'prod' : 'dev';
 
 			if( (isset($file['minify']) && $file['minify'] == true) || (!isset($file['minify']) && $minify) ):
 
-				$file_data .=  $this->_minify( $flag, $file['dev'] ) . "\n";
+				$file_data .= rtrim( $this->_minify( $flag, $file['dev'] ), $suffix ) . $suffix ."\n";
 
 			else:
 
 				$r = ( $this->isURL($file[$v]) ) ? $file[$v] : realpath($path.$file[$v]);
-				$file_data .=  $this->_get_contents( $r ) ."\n";
+				$file_data .=  rtrim( $this->_get_contents( $r ), $suffix ) . $suffix ."\n";
 
 			endif;
 
@@ -1218,4 +1218,4 @@ public static function isURL($string)
 		$pattern = '@(((https?|ftp):)?//([-\w\.]+)+(:\d+)?(/([\w/_\.]*(\?\S+)?)?)?)@';
 		return preg_match($pattern, $string);
 	}
-}
+}