partkeepr

commit 242c5dca324a434b4a11c746fb4b4956d3213915
parent 65f623438d39b7a061fafb88d607983de38af60e
Author: Timo A. Hummel <felicitus@felicitus.org>
Date:   Sun,  3 Jan 2016 00:55:28 +0100

Use separate extjs file, use minified extjs if debug is disabled, fixes #527

Diffstat:
M
src/PartKeepr/FrontendBundle/Controller/IndexController.php
 | 
2
+-
M
src/PartKeepr/FrontendBundle/Resources/views/index.html.twig
 | 
22
+++++++++++++++++++---

2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/PartKeepr/FrontendBundle/Controller/IndexController.php b/src/PartKeepr/FrontendBundle/Controller/IndexController.php
@@ -5,7 +5,6 @@ namespace PartKeepr\FrontendBundle\Controller;
 use Doctrine\Common\Version as DoctrineCommonVersion;
 use Doctrine\DBAL\Version as DBALVersion;
 use Doctrine\ORM\Version as ORMVersion;
-use PartKeepr\AuthBundle\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -58,6 +57,7 @@ class IndexController extends Controller
 
         $renderParams = array();
         $renderParams["parameters"] = $aParameters;
+        $renderParams["debug"] = $this->get("kernel")->isDebug();
 
         return $this->render('PartKeeprFrontendBundle::index.html.twig', $renderParams);
     }
diff --git a/src/PartKeepr/FrontendBundle/Resources/views/index.html.twig b/src/PartKeepr/FrontendBundle/Resources/views/index.html.twig
@@ -36,19 +36,35 @@
             }
         }
     </script>
+    {% if debug %}
+        {% javascripts output='js/compiled/extjs.js'
+        'js/packages/extjs6/build/ext-all-debug.js'
+        'js/packages/extjs6/build/packages/ux/classic/ux-debug.js' %}
+        <script type="text/javascript" src="{{ asset_url }}"></script>
+        {% endjavascripts %}
+    {% else %}
+        {% javascripts output='js/compiled/extjs.js'
+        'js/packages/extjs6/build/ext-all.js'
+        'js/packages/extjs6/build/packages/ux/classic/ux.js' %}
+        <script type="text/javascript" src="{{ asset_url }}"></script>
+        {% endjavascripts %}
+
+    {% endif %}
     {% javascripts output='js/compiled/main.js'
-    'js/packages/extjs6/build/ext-all-debug.js'
     'js/packages/extjs6/build/packages/charts/classic/charts.js'
-    'js/packages/extjs6/build/packages/ux/classic/ux-debug.js'
     '@PartKeeprFrontendBundle/Resources/public/js/Data/CallActions.js'
     '@PartKeeprFrontendBundle/Resources/public/js/Data/field/Array.js'
     '@PartKeeprFrontendBundle/Resources/public/js/Data/HydraModel.js'
     '@PartKeeprFrontendBundle/Resources/public/js/Data/HydraTreeModel.js'
     '@PartKeeprFrontendBundle/Resources/public/js/ExtJS/Enhancements/Ext.data.field.Date-ISO8601.js' %}
-
     <script type="text/javascript" src="{{ asset_url }}"></script>
+
     {% endjavascripts %}
 
+
+
+
+
     {% javascripts output='js/compiled/models.js'
         'bundles/doctrinereflection/*'
     %}