From 49beb8cee4b5b3acd30aa8d67dbd2803cb9f5eaa Mon Sep 17 00:00:00 2001 From: shaffe-fr Date: Fri, 22 Aug 2014 18:24:30 +0200 Subject: [PATCH 1/3] Fix javascript error on combined files This prevent JavaScript error when combined files are not ending with a semi-colon character. --- libraries/carabiner.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/carabiner.php b/libraries/carabiner.php index 590deee..e908849 100644 --- a/libraries/carabiner.php +++ b/libraries/carabiner.php @@ -868,23 +868,23 @@ private function _combine($flag, $files, $filename) { $file_data = ''; - + + $js_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 .= $this->_minify( $flag, $file['dev'] ) . $js_suffix ."\n"; else: $r = ( $this->isURL($file[$v]) ) ? $file[$v] : realpath($path.$file[$v]); - $file_data .= $this->_get_contents( $r ) ."\n"; + $file_data .= $this->_get_contents( $r ) . $js_suffix ."\n"; endif; @@ -1218,4 +1218,4 @@ public static function isURL($string) $pattern = '@(((https?|ftp):)?//([-\w\.]+)+(:\d+)?(/([\w/_\.]*(\?\S+)?)?)?)@'; return preg_match($pattern, $string); } -} \ No newline at end of file +} From d4dfe685566089cafd3a6199b7cd5227ae96f8f9 Mon Sep 17 00:00:00 2001 From: Charly Faille Date: Tue, 4 Nov 2014 22:14:37 +0100 Subject: [PATCH 2/3] Rename variable Rename the variable as request by tonydewan. --- libraries/carabiner.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/carabiner.php b/libraries/carabiner.php index e908849..7878131 100644 --- a/libraries/carabiner.php +++ b/libraries/carabiner.php @@ -869,7 +869,7 @@ private function _combine($flag, $files, $filename) $file_data = ''; - $js_suffix = $flag == 'js' ? ';' : ''; + $suffix = $flag == 'js' ? ';' : ''; $path = ($flag == 'css') ? $this->style_path : $this->script_path; $minify = ($flag == 'css') ? $this->minify_css : $this->minify_js; @@ -879,12 +879,12 @@ private function _combine($flag, $files, $filename) if( (isset($file['minify']) && $file['minify'] == true) || (!isset($file['minify']) && $minify) ): - $file_data .= $this->_minify( $flag, $file['dev'] ) . $js_suffix ."\n"; + $file_data .= $this->_minify( $flag, $file['dev'] ) . $suffix ."\n"; else: $r = ( $this->isURL($file[$v]) ) ? $file[$v] : realpath($path.$file[$v]); - $file_data .= $this->_get_contents( $r ) . $js_suffix ."\n"; + $file_data .= $this->_get_contents( $r ) . $suffix ."\n"; endif; From ab102c0a307d55bc3f1944224d7c346f61e1575d Mon Sep 17 00:00:00 2001 From: Charly Faille Date: Mon, 10 Nov 2014 18:41:06 +0100 Subject: [PATCH 3/3] Avoid multiple suffixes --- libraries/carabiner.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/carabiner.php b/libraries/carabiner.php index 7878131..22c7382 100644 --- a/libraries/carabiner.php +++ b/libraries/carabiner.php @@ -879,12 +879,12 @@ private function _combine($flag, $files, $filename) if( (isset($file['minify']) && $file['minify'] == true) || (!isset($file['minify']) && $minify) ): - $file_data .= $this->_minify( $flag, $file['dev'] ) . $suffix ."\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 ) . $suffix ."\n"; + $file_data .= rtrim( $this->_get_contents( $r ), $suffix ) . $suffix ."\n"; endif;