fix fosjs routes

domstor-project · Sep 29, 2017 · fa6eada · fa6eada
1 parent d8758c4
commit fa6eada
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,5 +49,5 @@ nbproject/*
 vendor/*
 .idea/
 .hg/*
-/domstor-project/*
+/domstor-project/**
 /stepanets/**
diff --git a/composer.json b/composer.json
@@ -21,7 +21,6 @@
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/orm": "^2.5",
         "domstor-project/template-bundle": "^1.5",
-        "friendsofsymfony/jsrouting-bundle": "^1.6",
         "incenteev/composer-parameter-handler": "^2.0",
         "leafo/scssphp": "^0.6",
         "patchwork/jsqueeze": "^2.0",

diff --git a/src/AppBundle/Resources/views/layout.html.twig b/src/AppBundle/Resources/views/layout.html.twig
@@ -18,15 +18,15 @@
             'https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js' 
             '@AppBundle/Resources/public/js/main.js'
             '@AppBundle/Resources/public/js/scrolltop.js'
-            'bundles/fosjsrouting/js/router.js'
-            'js/fos_js_routes.js'
         %}
         <script src="{{ asset_url }}"></script>
         {% endjavascripts %}
     <!--[if lt IE 9]>
         <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
         <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
+        <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
+        <script src="{{ path('fos_js_routing_js', {'callback': 'fos.Router.setData'}) }}"></script>
     {% block content_js %}{% endblock %}
 {% endblock %}