From 1f3ef3aebbfed1c3808e2bfb39b0ca6933359210 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 3 Dec 2015 14:47:34 -0700
Subject: [PATCH] Use new methods to disable CSS/JS Pipeline if available
 (without effecting config) #318

---
 admin.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/admin.php b/admin.php
index b233ada0..baa0e437 100644
--- a/admin.php
+++ b/admin.php
@@ -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]
         ]);