Skip to content

Commit b490bbb

Browse files
authored
Merge pull request #7 from Juniorbuka/patch-7
Update snippet.js.php
2 parents 5279aa3 + 0062de6 commit b490bbb

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed
Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
<?php
22
if(!defined('MODX_BASE_PATH')) {die('What are you doing? Get out of here!');}
33

4-
//параметры
5-
$files = isset($files) ? $files : ''; // Список файлов (css, scss, less)
6-
$minify = isset($minify) ? $minify : '1'; //сжымать и минифицировать файлы
7-
$folder = isset($folder) ? $folder : ''; // папка для сгенерированных стилей по умолчанию в корень
8-
//$inline = isset($inline) ? $inline : ''; // инлайн код стилей
9-
//$parse = isset($parse) ? $parse : '0'; //обрабатывать ли теги MODX
4+
// Parameters
5+
$files = isset($files) ? $files : ''; // List of files (css, scss, less)
6+
$minify = isset($minify) ? $minify : '1'; // Minify and compress files
7+
$folder = isset($folder) ? $folder : ''; // Folder for generated styles, default is the root
8+
$filename = isset($filename) ? $filename : 'scripts'; // Filename
9+
$filepre = isset($filepre) ? $filepre : ''; // Load file, e.g., (defer)
1010

11-
//Обрабатываем файлы, преобразовываем less и scss
11+
// Process files, convert less and scss
1212
$filesArr = explode(',', str_replace('\n', '', $files));
1313
foreach ($filesArr as $key => $value) {
14-
$file = MODX_BASE_PATH . trim($value);
15-
$v[$key] = filemtime($file);
16-
$filesForMin[$key] = $file;
14+
$file = MODX_BASE_PATH . trim($value);
15+
$v[$key] = filemtime($file);
16+
$filesForMin[$key] = $file;
1717
}
18+
1819
if ($minify == '1') {
19-
include_once(MODX_BASE_PATH. "assets/snippets/cssjs/class.magic-min.php");
20-
$minified = new Minifier();
21-
$min = $minified->merge( MODX_BASE_PATH.$folder.'scripts.min.js', 'js', $filesForMin );
22-
return '<script src="'.$modx->config['site_url'].$folder.'scripts.min.js?v='.substr(md5(max($v)),0,3).'"></script>';
23-
}else{
24-
$links = '';
25-
foreach ($filesArr as $key => $value) {
26-
$links .= '<script src="'.$modx->config['site_url'].trim($value).'?v='.substr(md5($v[$key]),0,3).'"></script>';
27-
}
28-
return $links;
20+
include_once(MODX_BASE_PATH. "assets/snippets/cssjs/class.magic-min.php");
21+
$minified = new Minifier();
22+
$min = $minified->merge(MODX_BASE_PATH.$folder.$filename.'.min.js', 'js', $filesForMin);
23+
return '<script '.$filepre.' src="'.$modx->config['site_url'].$folder.$filename.'.min.js?v='.substr(md5(max($v)),0,3).'"></script>';
24+
} else {
25+
$links = '';
26+
foreach ($filesArr as $key => $value) {
27+
$links .= '<script src="'.$modx->config['site_url'].trim($value).'?v='.substr(md5($v[$key]),0,3).'"></script>';
28+
}
29+
return $links;
2930
}
30-
?>
31+
?>

0 commit comments

Comments
 (0)