mirror of
https://github.com/monstra-cms/monstra.git
synced 2025-08-04 20:27:40 +02:00
Plugin API: Stylesheet and Javascript load() methods - fixed
This commit is contained in:
@@ -951,49 +951,55 @@
|
|||||||
// Sort stylesheets by priority
|
// Sort stylesheets by priority
|
||||||
$stylesheets = Arr::subvalSort(Stylesheet::$stylesheets, 'priority');
|
$stylesheets = Arr::subvalSort(Stylesheet::$stylesheets, 'priority');
|
||||||
|
|
||||||
// Build backend site stylesheets
|
if (BACKEND) {
|
||||||
foreach ($stylesheets as $stylesheet) {
|
|
||||||
if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both')) ) {
|
|
||||||
if ( ! file_exists($backend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($backend_site_css_path)) {
|
|
||||||
$backend_regenerate = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Regenerate site stylesheet
|
// Build backend site stylesheets
|
||||||
if ($backend_regenerate) {
|
|
||||||
foreach ($stylesheets as $stylesheet) {
|
foreach ($stylesheets as $stylesheet) {
|
||||||
if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both')) ) {
|
if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both')) ) {
|
||||||
$backend_buffer .= file_get_contents(ROOT . DS . $stylesheet['file']);
|
if ( ! file_exists($backend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($backend_site_css_path)) {
|
||||||
|
$backend_regenerate = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$backend_buffer = Stylesheet::parseVariables($backend_buffer);
|
|
||||||
file_put_contents($backend_site_css_path, Minify::css($backend_buffer));
|
|
||||||
$backend_regenerate = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Regenerate site stylesheet
|
||||||
// Build frontend site stylesheets
|
if ($backend_regenerate) {
|
||||||
foreach ($stylesheets as $stylesheet) {
|
foreach ($stylesheets as $stylesheet) {
|
||||||
if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both')) ) {
|
if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both')) ) {
|
||||||
if ( ! file_exists($frontend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($frontend_site_css_path)) {
|
$backend_buffer .= file_get_contents(ROOT . DS . $stylesheet['file']);
|
||||||
$frontend_regenerate = true;
|
}
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
$backend_buffer = Stylesheet::parseVariables($backend_buffer);
|
||||||
|
file_put_contents($backend_site_css_path, Minify::css($backend_buffer));
|
||||||
|
$backend_regenerate = false;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Regenerate site stylesheet
|
|
||||||
if ($frontend_regenerate) {
|
} else {
|
||||||
|
|
||||||
|
// Build frontend site stylesheets
|
||||||
foreach ($stylesheets as $stylesheet) {
|
foreach ($stylesheets as $stylesheet) {
|
||||||
if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both')) ) {
|
if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both')) ) {
|
||||||
$frontend_buffer .= file_get_contents(ROOT . DS . $stylesheet['file']);
|
if ( ! file_exists($frontend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($frontend_site_css_path)) {
|
||||||
|
$frontend_regenerate = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$frontend_buffer = Stylesheet::parseVariables($frontend_buffer);
|
|
||||||
file_put_contents($frontend_site_css_path, Minify::css($frontend_buffer));
|
// Regenerate site stylesheet
|
||||||
$frontend_regenerate = false;
|
if ($frontend_regenerate) {
|
||||||
|
foreach ($stylesheets as $stylesheet) {
|
||||||
|
if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both')) ) {
|
||||||
|
$frontend_buffer .= file_get_contents(ROOT . DS . $stylesheet['file']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$frontend_buffer = Stylesheet::parseVariables($frontend_buffer);
|
||||||
|
file_put_contents($frontend_site_css_path, Minify::css($frontend_buffer));
|
||||||
|
$frontend_regenerate = false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render
|
// Render
|
||||||
@@ -1089,47 +1095,53 @@
|
|||||||
// Sort javascripts by priority
|
// Sort javascripts by priority
|
||||||
$javascripts = Arr::subvalSort(Javascript::$javascripts, 'priority');
|
$javascripts = Arr::subvalSort(Javascript::$javascripts, 'priority');
|
||||||
|
|
||||||
// Build backend site javascript
|
|
||||||
foreach ($javascripts as $javascript) {
|
|
||||||
if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both')) ) {
|
|
||||||
if ( ! file_exists($backend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($backend_site_js_path)) {
|
|
||||||
$backend_regenerate = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Regenerate site javascript
|
if (BACKEND) {
|
||||||
if ($backend_regenerate) {
|
|
||||||
|
// Build backend site javascript
|
||||||
foreach ($javascripts as $javascript) {
|
foreach ($javascripts as $javascript) {
|
||||||
if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both')) ) {
|
if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both')) ) {
|
||||||
$backend_buffer .= file_get_contents(ROOT . DS . $javascript['file']);
|
if ( ! file_exists($backend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($backend_site_js_path)) {
|
||||||
|
$backend_regenerate = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
file_put_contents($backend_site_js_path, $backend_buffer);
|
|
||||||
$backend_regenerate = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Regenerate site javascript
|
||||||
// Build frontend site javascript
|
if ($backend_regenerate) {
|
||||||
foreach ($javascripts as $javascript) {
|
foreach ($javascripts as $javascript) {
|
||||||
if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both')) ) {
|
if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both')) ) {
|
||||||
if ( ! file_exists($frontend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($frontend_site_js_path)) {
|
$backend_buffer .= file_get_contents(ROOT . DS . $javascript['file']);
|
||||||
$frontend_regenerate = true;
|
}
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
file_put_contents($backend_site_js_path, $backend_buffer);
|
||||||
|
$backend_regenerate = false;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Regenerate site javascript
|
} else {
|
||||||
if ($frontend_regenerate) {
|
|
||||||
|
// Build frontend site javascript
|
||||||
foreach ($javascripts as $javascript) {
|
foreach ($javascripts as $javascript) {
|
||||||
if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both')) ) {
|
if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both')) ) {
|
||||||
$frontend_buffer .= file_get_contents(ROOT . DS . $javascript['file']);
|
if ( ! file_exists($frontend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($frontend_site_js_path)) {
|
||||||
|
$frontend_regenerate = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
file_put_contents($frontend_site_js_path, $frontend_buffer);
|
|
||||||
$frontend_regenerate = false;
|
// Regenerate site javascript
|
||||||
|
if ($frontend_regenerate) {
|
||||||
|
foreach ($javascripts as $javascript) {
|
||||||
|
if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both')) ) {
|
||||||
|
$frontend_buffer .= file_get_contents(ROOT . DS . $javascript['file']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
file_put_contents($frontend_site_js_path, $frontend_buffer);
|
||||||
|
$frontend_regenerate = false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render
|
// Render
|
||||||
|
Reference in New Issue
Block a user