Rework: See PR #41

Author: stefanheimes

src/EventListener/Contao/InitializeSystem.php

@@ -28,7 +28,6 @@
 use Contao\Input;
 use Contao\System;
 use MenAtWork\MultiColumnWizardBundle\Service\ContaoApiService;
-use Symfony\Component\Asset\Packages;
 
 /**
  * Class InitializeSystem
@@ -40,19 +39,13 @@ class InitializeSystem
      */
     private ContaoApiService $contaoApi;
 
-    /**
-     * @var Packages
-     */
-    private Packages $packages;
-
     /**
      * @param ContaoApiService $contaoApi
      * @param Packages $packages
      */
-    public function __construct(ContaoApiService $contaoApi, Packages $packages)
+    public function __construct(ContaoApiService $contaoApi)
     {
         $this->contaoApi = $contaoApi;
-        $this->packages = $packages;
     }
 
     /**
@@ -79,12 +72,6 @@ public function addSystemNecessaryThings(): void
         $GLOBALS['TL_CSS']['multicolumnwizard'] = System::getContainer()->get('kernel')->isDebug()
             ? 'bundles/multicolumnwizard/css/multicolumnwizard_src.css'
             : 'bundles/multicolumnwizard/css/multicolumnwizard.css';
-
-        // Load the old mooRainbow picker in Contao 5.5
-        if (version_compare(ContaoCoreBundle::getVersion(), '5.5', '>=')) {
-            $GLOBALS['TL_JAVASCRIPT']['mooRainbow'] = $this->packages->getUrl('js/mooRainbow.min.js', 'contao-components/colorpicker');
-            $GLOBALS['TL_CSS']['mooRainbow'] = $this->packages->getUrl('css/mooRainbow.min.css', 'contao-components/colorpicker');
-        }
     }
 
     /**

src/EventListener/Mcw/ColorPicker.php

@@ -23,17 +23,21 @@
 
 namespace MenAtWork\MultiColumnWizardBundle\EventListener\Mcw;
 
+use Contao\CoreBundle\ContaoCoreBundle;
 use Contao\CoreBundle\Framework\Adapter;
 use Contao\Image;
 use Contao\StringUtil;
 use MenAtWork\MultiColumnWizardBundle\Event\GetColorPickerStringEvent;
+use MenAtWork\MultiColumnWizardBundle\Service\ContaoApiService;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class ColorPicker
  */
 class ColorPicker
 {
+    static private $jsLoaded = false;
+
     /**
      * Adapter to the image class.
      *
@@ -55,6 +59,13 @@ class ColorPicker
      */
     private $translator;
 
+    /**
+     * Some functions to work with contao.
+     *
+     * @var ContaoApiService
+     */
+    private $contaoApi;
+
     /**
      * ColorPicker constructor.
      *
@@ -64,11 +75,43 @@ class ColorPicker
      *
      * @param TranslatorInterface $translator        Translator class.
      */
-    public function __construct($imageAdapter, $stringUtilAdapter, $translator)
+    public function __construct
+    (
+        $imageAdapter,
+        $stringUtilAdapter,
+        $translator,
+        ContaoApiService $contaoApi
+    )
     {
-        $this->imageAdapter      = $imageAdapter;
+        $this->imageAdapter = $imageAdapter;
         $this->stringUtilAdapter = $stringUtilAdapter;
-        $this->translator        = $translator;
+        $this->translator = $translator;
+        $this->contaoApi = $contaoApi;
+    }
+
+    /**
+     * Load the old mooRainbow picker in Contao 5.5
+     *
+     * @return void
+     */
+    private function loadJs()
+    {
+        // Run only ones.
+        if(self::$jsLoaded === true ){
+            return;
+        }
+        self::$jsLoaded = true;
+
+        if (version_compare($this->contaoApi->getContaoVersion(), '5.5', '>=')) {
+            $GLOBALS['TL_JAVASCRIPT']['mooRainbow'] = $this->contaoApi->getFileUrl(
+                'js/mooRainbow.min.js',
+                'contao-components/colorpicker'
+            );
+            $GLOBALS['TL_CSS']['mooRainbow']        = $this->contaoApi->getFileUrl(
+                'css/mooRainbow.min.css',
+                'contao-components/colorpicker'
+            );
+        }
     }
 
     /**
@@ -80,6 +123,8 @@ public function __construct($imageAdapter, $stringUtilAdapter, $translator)
      */
     public function executeEvent(GetColorPickerStringEvent $event)
     {
+        $this->loadJs();
+
         // Get some vars.
         $fieldConfiguration = $event->getFieldConfiguration();
         $fieldId            = $event->getFieldId();

src/Resources/config/listener.yml

@@ -31,6 +31,7 @@ services:
       - '@=service(''contao.framework'').getAdapter(''Contao\\Image'')'
       - '@=service(''contao.framework'').getAdapter(''Contao\\StringUtil'')'
       - "@translator"
+      - "@MenAtWork\MultiColumnWizardBundle\Service\ContaoApiService"
     tags:
       - name: kernel.event_listener
         event: men-at-work.multi-column-wizard-bundle.get-color-picker

src/Resources/config/services.yml

@@ -23,3 +23,4 @@ services:
     arguments:
       - '@request_stack'
       - '@contao.routing.scope_matcher'
+      - '@assets.packages'

src/Service/ContaoApiService.php

@@ -21,19 +21,34 @@
 
 use Composer\InstalledVersions;
 use Contao\CoreBundle\Routing\ScopeMatcher;
+use Symfony\Component\Asset\Packages;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 class ContaoApiService
 {
+    /**
+     * @var RequestStack
+     */
     private RequestStack $requestStack;
+
+    /**
+     * @var ScopeMatcher
+     */
     private ScopeMatcher $scopeMatcher;
 
+    /**
+     * @var Packages
+     */
+    private Packages $packages;
+
     public function __construct(
         RequestStack $requestStack,
-        ScopeMatcher $scopeMatcher
+        ScopeMatcher $scopeMatcher,
+        Packages     $packages
     ) {
         $this->requestStack = $requestStack;
         $this->scopeMatcher = $scopeMatcher;
+        $this->packages     = $packages;
     }
 
     /**
@@ -77,4 +92,17 @@ public function getContaoVersion(): ?string
     {
         return InstalledVersions::getPrettyVersion('contao/core-bundle');
     }
+
+    /**
+     * Returns the public path for a file.
+     *
+     * @param string      $path
+     * @param string|null $packageName
+     *
+     * @return string
+     */
+    public function getFileUrl(string $path, ?string $packageName = null): string
+    {
+        return $this->packages->getUrl($path, $packageName);
+    }
 }