Merge pull request #113 from FriendsOfCake/assetcompress

Make usage of AssetCompress configurable.
FriendsOfCake · Apr 28, 2016 · 7ff2418 · 7ff2418
2 parents d8a7b03 + 6b3ce21
commit 7ff2418
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/config/defaults.php b/config/defaults.php
@@ -1,4 +1,6 @@
 <?php
+use \Cake\Core\Plugin;
+
 return [
     'CrudView' => [
         'brand' => 'Crud View',
@@ -22,5 +24,6 @@
             ]
         ],
         'timezoneAwareDateTimeWidget' => false,
+        'useAssetCompress' => Plugin::loaded('AssetCompress')
     ]
 ];
diff --git a/src/View/CrudView.php b/src/View/CrudView.php
@@ -52,7 +52,7 @@ public function initialize()
      */
     protected function _loadAssets()
     {
-        if (Plugin::loaded('AssetCompress')) {
+        if (Configure::read('CrudView.useAssetCompress')) {
             $this->AssetCompress->css('CrudView.crudview', ['block' => true]);
             $this->AssetCompress->script('CrudView.crudview_head', ['block' => 'headjs']);
             $this->AssetCompress->script('CrudView.crudview', ['block' => true]);
@@ -95,7 +95,7 @@ protected function _setupHelpers()
         $this->loadHelper('CrudView.CrudView');
         $this->loadHelper('BootstrapUI.Flash');
 
-        if (Plugin::loaded('AssetCompress')) {
+        if (Configure::read('CrudView.useAssetCompress')) {
             $this->loadHelper('AssetCompress.AssetCompress');
         }
     }