TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #547 - Duplicate assets are pointless

This commit is contained in:
Sam Georges 2014-08-16 09:17:09 +10:00
parent e4ee8fdc46
commit 982b22a676
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/system/traits/AssetMaker.php
View File

@ -38,13 +38,21 @@ trait AssetMaker
if ($type != null) $type = strtolower($type);
$result = null;
$reserved = ['build'];
$pathCache = [];
if ($type == null || $type == 'css'){
foreach ($this->assets['css'] as $asset) {
/*
* Prevent duplicates
*/
$path = $this->getAssetEntryBuildPath($asset);
if (isset($pathCache[$path])) continue;
$pathCache[$path] = true;
$attributes = HTML::attributes(array_merge([
'rel' => 'stylesheet',
'href' => $this->getAssetEntryBuildPath($asset)
'href' => $path
],
array_except($asset['attributes'], $reserved)
));
@ -56,9 +64,16 @@ trait AssetMaker
if ($type == null || $type == 'rss'){
foreach ($this->assets['rss'] as $asset) {
/*
* Prevent duplicates
*/
$path = $this->getAssetEntryBuildPath($asset);
if (isset($pathCache[$path])) continue;
$pathCache[$path] = true;
$attributes = HTML::attributes(array_merge([
'rel' => 'alternate',
'href' => $this->getAssetEntryBuildPath($asset),
'href' => $path,
'title' => 'RSS',
'type' => 'application/rss+xml'
],
@ -72,8 +87,15 @@ trait AssetMaker
if ($type == null || $type == 'js') {
foreach ($this->assets['js'] as $asset) {
/*
* Prevent duplicates
*/
$path = $this->getAssetEntryBuildPath($asset);
if (isset($pathCache[$path])) continue;
$pathCache[$path] = true;
$attributes = HTML::attributes(array_merge([
'src' => $this->getAssetEntryBuildPath($asset)
'src' => $path
],
array_except($asset['attributes'], $reserved)
));