Use new methods to disable CSS/JS Pipeline if available (without effecting config) #318

This commit is contained in:
Andy Miller
2015-12-03 14:47:34 -07:00
parent 71e1fdfa7b
commit 1f3ef3aebb

View File

@@ -108,9 +108,11 @@ class AdminPlugin extends Plugin
$this->grav['debugger']->addMessage("Admin Basic");
$this->initializeAdmin();
// Disable Asset pipelining
$this->config->set('system.assets.css_pipeline', false);
$this->config->set('system.assets.js_pipeline', false);
// Disable Asset pipelining (old method - remove this after Grav is updated)
if (!method_exists($this->grav['assets'],'setJsPipeline')) {
$this->config->set('system.assets.css_pipeline', false);
$this->config->set('system.assets.js_pipeline', false);
}
// Replace themes service with admin.
$this->grav['themes'] = function ($c) {
@@ -228,6 +230,16 @@ class AdminPlugin extends Plugin
}
}
public function onAssetsInitialized()
{
// Disable Asset pipelining
$assets = $this->grav['assets'];
if (method_exists($assets,'setJsPipeline')) {
$assets->setJsPipeline(false);
$assets->setCssPipeline(false);
}
}
/**
* Add twig paths to plugin templates.
*/
@@ -353,6 +365,7 @@ class AdminPlugin extends Plugin
'onPagesInitialized' => ['onPagesInitialized', 1000],
'onTwigTemplatePaths' => ['onTwigTemplatePaths', 1000],
'onTwigSiteVariables' => ['onTwigSiteVariables', 1000],
'onAssetsInitialized' => ['onAssetsInitialized', 1000],
'onTask.GPM' => ['onTaskGPM', 0]
]);