From b23471a22b05ed9910f6a5e37810e2a4e52e22c9 Mon Sep 17 00:00:00 2001 From: Christian Griffin Date: Sat, 19 Nov 2016 11:04:08 -0500 Subject: [PATCH 1/2] Added support for 'skip files' that render normally even with the compression enabled. --- AssetsAutoCompressComponent.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/AssetsAutoCompressComponent.php b/AssetsAutoCompressComponent.php index 62e2d51..f459a7a 100644 --- a/AssetsAutoCompressComponent.php +++ b/AssetsAutoCompressComponent.php @@ -146,6 +146,13 @@ class AssetsAutoCompressComponent extends Component implements BootstrapInterfac public $noIncludeJsFilesOnPjax = true; + /** + * Skip specific filenames. + * @var array + */ + public $skip = []; + + /** * @param \yii\base\Application $app */ @@ -386,6 +393,13 @@ protected function _processingJsFiles($files = []) $resultFiles = []; foreach ($files as $fileCode => $fileTag) { + + if(in_array(array_pop(explode('/', $fileCode)), $this->skip)) + { + $resultFiles[$fileCode] = $fileTag; + continue; + } + if (Url::isRelative($fileCode)) { $contentFile = $this->fileGetContents( Url::to(\Yii::getAlias($fileCode), true) ); From 2eaa6909fdf00acc12417b19ccf882066882c1b4 Mon Sep 17 00:00:00 2001 From: Christian Griffin Date: Sat, 19 Nov 2016 11:12:01 -0500 Subject: [PATCH 2/2] Added file skip support to CSS files and fixed bug where skip file support wouldn't take once the compressed assets had been generated. --- AssetsAutoCompressComponent.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/AssetsAutoCompressComponent.php b/AssetsAutoCompressComponent.php index f459a7a..e2c1c28 100644 --- a/AssetsAutoCompressComponent.php +++ b/AssetsAutoCompressComponent.php @@ -369,6 +369,12 @@ protected function _processingJsFiles($files = []) foreach ($files as $fileCode => $fileTag) { + if(in_array(array_pop(explode('/', $fileCode)), $this->skip)) + { + $resultFiles[$fileCode] = $fileTag; + continue; + } + if (!Url::isRelative($fileCode)) { $resultFiles[$fileCode] = $fileTag; @@ -480,6 +486,12 @@ protected function _processingCssFiles($files = []) foreach ($files as $fileCode => $fileTag) { + if(in_array(array_pop(explode('/', $fileCode)), $this->skip)) + { + $resultFiles[$fileCode] = $fileTag; + continue; + } + if (Url::isRelative($fileCode)) { @@ -505,6 +517,12 @@ protected function _processingCssFiles($files = []) $resultFiles = []; foreach ($files as $fileCode => $fileTag) { + if(in_array(array_pop(explode('/', $fileCode)), $this->skip)) + { + $resultFiles[$fileCode] = $fileTag; + continue; + } + if (Url::isRelative($fileCode)) { $contentTmp = trim($this->fileGetContents( Url::to(\Yii::getAlias($fileCode), true) ));