0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Summer rain remix, more debugging information

Browse source
This commit is contained in:
markseu 2018-08-24 12:46:30 +02:00
parent 347a5d006b
commit 374c475a15
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
system/plugins/bundle.php
View file

@ -4,7 +4,7 @@
// This file may be used and distributed under the terms of the public license.
class YellowBundle {
const VERSION = "0.7.1";
const VERSION = "0.7.2";
public $yellow; //access to API
// Handle initialisation
@ -96,7 +96,7 @@ class YellowBundle {
$this->yellow->toolbox->timerStart($time);
$id = substru(md5(implode($fileNames).$base), 0, 10);
$fileNameBundle = $this->yellow->config->get("assetDir")."bundle-$id.min.$type";;
$locationBundle = $base.$this->yellow->config->get("assetLocation")."bundle-$id.min.$type";;
$locationBundle = $base.$this->yellow->config->get("assetLocation")."bundle-$id.min.$type";
if ($type=="css") {
$data[$locationBundle] = "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"".htmlspecialchars($locationBundle)."\" />\n";
} else {
@ -111,6 +111,10 @@ class YellowBundle {
$fileDataNew .= "/* ".basename($fileName)." */\n";
$fileDataNew .= $fileData;
}
if (defined("DEBUG") && DEBUG>=2) {
if(!empty($fileDataNew)) $fileDataNew .= "\n\n";
$fileDataNew .= "/* YellowBundle::processBundle file:$fileNameBundle <- ".$this->yellow->page->fileName." */";
}
if (!$this->yellow->toolbox->createFile($fileNameBundle, $fileDataNew) ||
!$this->yellow->toolbox->modifyFile($fileNameBundle, $modified)) {
$this->yellow->page->error(500, "Can't write file '$fileNameBundle'!");
@ -146,7 +150,6 @@ class YellowBundle {
// Process bundle, minify data
public function processBundleMinify($scheme, $address, $base, $fileData, $fileName, $type) {
$minifier = $type=="css" ? new MinifyCss() : new MinifyJavaScript();
if (preg_match("/\.min/", $fileName)) $minifier = new MinifyBasic();
$minifier->add($fileData);