wait #6375 @0.25

diff --git a/app/Elearning/QuizCompiler.php b/app/Elearning/QuizCompiler.php
index a89634e7d194b525a28fcc747014fee5399df217..71a413ae6497e1bc2efddc0f38bd9ad2fd39df6b 100644 (file)
--- a/app/Elearning/QuizCompiler.php
+++ b/app/Elearning/QuizCompiler.php
@@ -164,8 +164,7 @@ class QuizCompiler extends Base
         $this->_addBackgrounds('background');
         $this->_addBackgrounds('intro');
         $this->_addBackgrounds('standard');
-        $this->_addBackgrounds('draganddropArea1');
-        $this->_addBackgrounds('draganddropArea2');
+        $this->_addBackgrounds('draganddrop');
 
         $this->writeSass();
     }
@@ -176,12 +175,7 @@ class QuizCompiler extends Base
         $sassPrefix = $sassPrefix ?? $dataKey;
         $this->data->set($dataKey, '');
         $this->data->set($dataKey . 'Mobile', '');
-
-        $dataKeyCustom = $dataKey . 'Custom';
-        if (str_starts_with($dataKey, 'draganddrop')) {
-            $dataKeyCustom = 'draganddropCustom';
-        }
-        $custom = $this->theme->$dataKeyCustom;
+        $custom = $this->theme->{$dataKey . 'Custom'};
 
         if ($custom) {
             $this->_addBackgroundVariables($sassPrefix . '-desktop', $themePrefix, $dataKey);

diff --git a/app/Models/QuizTheme.php b/app/Models/QuizTheme.php
index 6ce0e1b3a94f919ec91ca8a2576669aec8d70eb7..6d181232ffb966602f1adab1eb2d4c96038b5943 100644 (file)
--- a/app/Models/QuizTheme.php
+++ b/app/Models/QuizTheme.php
@@ -34,10 +34,8 @@ class QuizTheme extends ToolboxModel
     protected static $_permissionBase = 'quiz';
 
     public $registerMediaConversionsUsingModelInstance = false;
-
     const DESKTOP_SIZE = '1200 x 680px';
     const MOBILE_SIZE = '390 x 844px';
-
     const ICON_SIZE = '512 x 512px';
 
     public function setFields()