From 417e208d8508c364cb6ef932b22dfdd0fb3c871e Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 28 Jan 2015 16:41:21 +0100 Subject: [PATCH] Prepare for backend usage. --- module/templates/leaflet_map_html.html5 | 4 +--- src/Netzmacht/Contao/Leaflet/ContaoAssets.php | 2 +- .../Leaflet/Subscriber/BootSubscriber.php | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/module/templates/leaflet_map_html.html5 b/module/templates/leaflet_map_html.html5 index 7bd835a..aad6f90 100644 --- a/module/templates/leaflet_map_html.html5 +++ b/module/templates/leaflet_map_html.html5 @@ -1,8 +1,6 @@
- L.contao.addMap('{$mapId}', function() { -{$javascript} + return { map: map, layers: layers, controls: controls, icons: icons }; }()); -HTML; diff --git a/src/Netzmacht/Contao/Leaflet/ContaoAssets.php b/src/Netzmacht/Contao/Leaflet/ContaoAssets.php index 9d2a6a6..bb46e29 100644 --- a/src/Netzmacht/Contao/Leaflet/ContaoAssets.php +++ b/src/Netzmacht/Contao/Leaflet/ContaoAssets.php @@ -40,7 +40,7 @@ class ContaoAssets implements Assets break; case static::TYPE_FILE: - if (!\Config::get('debugMode')) { + if (!\Config::get('debugMode') && TL_MODE === 'FE') { $script .= '|static'; } diff --git a/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php b/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php index 4fdf9cf..3e9eb79 100644 --- a/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php +++ b/src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php @@ -116,10 +116,7 @@ class BootSubscriber implements EventSubscriberInterface */ public function loadAssets() { - $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/maps/contao-leaflet.js' . (\Config::get('debugMode') - ? '' - : '|static' - ); + $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/maps/contao-leaflet.js' . $this->staticFlag(); } /** @@ -160,10 +157,16 @@ class BootSubscriber implements EventSubscriberInterface // @codingStandardsIgnoreStart // TODO: Cache it. // codingStandardsIgnoreEnd - $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/js/icons.js' . (\Config::get('debugMode') - ? '' - : '|static' - ); + $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/js/icons.js' . $this->staticFlag(); } } + + private function staticFlag() + { + if (\Config::get('debugMode') || TL_MODE !== 'FE') { + return ''; + } + + return '|static'; + } }