interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RC6

Browse Source
This commit is contained in:
Bastian Allgeier
2019-01-14 10:52:45 +01:00
parent 01277f79f2
commit 8070893b64
22 changed files with 482 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
kirby/config/helpers.php
View File

@@ -87,21 +87,22 @@ function css($url, $options = null)
return implode(PHP_EOL, $links);
}
$href = $url === '@auto' ? Url::toTemplateAsset('css/templates', 'css') : Url::to($url);
$attr = [
'href' => $href,
'rel' => 'stylesheet'
];
if (is_string($options) === true) {
$attr['media'] = $options;
$options = ['media' => $options];
}
if (is_array($options) === true) {
$attr = array_merge($options, $attr);
$kirby = App::instance();
if ($component = $kirby->component('css')) {
$url = $component($kirby, $url, $options);
}
$url = $url === '@auto' ? Url::toTemplateAsset('css/templates', 'css') : Url::to($url);
$attr = array_merge((array)$options, [
'href' => $url,
'rel' => 'stylesheet'
]);
return '<link ' . attr($attr) . '>';
}
@@ -334,19 +335,19 @@ function js($url, $options = null)
return implode(PHP_EOL, $scripts);
}
$src = $url === '@auto' ? Url::toTemplateAsset('js/templates', 'js') : Url::to($url);
$attr = [
'src' => $src,
];
if (is_bool($options) === true) {
$attr['async'] = $options;
$options = ['async' => $options];
}
if (is_array($options) === true) {
$attr = array_merge($options, $attr);
$kirby = App::instance();
if ($component = $kirby->component('js')) {
$url = $component($kirby, $url, $options);
}
$url = $url === '@auto' ? Url::toTemplateAsset('js/templates', 'js') : Url::to($url);
$attr = array_merge((array)$options, ['src' => $url]);
return '<script ' . attr($attr) . '></script>';
}