Skip to content

Commit 2b0a588

Browse files
ff1601comserver1601com
authored andcommitted
make multicolumnwizard work again, update composers.json
1 parent cb1ee6d commit 2b0a588

File tree

3 files changed

+12
-19
lines changed

3 files changed

+12
-19
lines changed

composer.json

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,14 @@
1717
}
1818
],
1919
"require": {
20-
"php": "^7.2 || ^8.0",
21-
"contao/core-bundle": "^4.9",
22-
"symfony/config": "^4.4 || ^5.1",
23-
"symfony/dependency-injection": "^4.4 || ^5.1",
24-
"symfony/http-kernel": "^4.4 || ^5.1"
20+
"php": "^5.6 || ^7.0",
21+
"contao/core-bundle": "4.*",
22+
"menatwork/contao-multicolumnwizard":"^3.0",
23+
"matthiasmullie/minify":"^1.3"
2524
},
2625
"conflict": {
2726
"contao/manager-plugin": "<2.0 || >=3.0"
2827
},
29-
"require-dev": {
30-
"contao/manager-plugin": "^2.0",
31-
"contao/easy-coding-standard": "^2.0",
32-
"phpunit/phpunit": "^8.4",
33-
"symfony/phpunit-bridge": "^4.4 || ^5.1",
34-
"agentur1601com/core-bundle": "^1.1.0"
35-
},
3628
"extra": {
3729
"contao-manager-plugin": "Agentur1601com\\FileLazyLoader\\ContaoManager\\Plugin"
3830
},
@@ -45,10 +37,5 @@
4537
"psr-4": {
4638
"Agentur1601com\\FileLazyLoader\\Tests\\": "tests/"
4739
}
48-
},
49-
"scripts": {
50-
"cs-fixer": [
51-
"vendor/bin/ecs check src/ tests/ --fix --ansi"
52-
]
5340
}
5441
}

src/EventListener/SeoSeeFiles.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public function loadJsFiles($savedFiles, DataContainer $dc)
3939
}
4040

4141
$removeExternalFiles = $dc->activeRecord->fileLazyLoaderModifyExtJs === '1' ? false : true;
42-
43-
var_dump($this->_jsLoader->returnMultiColumnWizardArray($pathLoadedFiles, unserialize($savedFiles), $removeExternalFiles));
42+
4443
return $this->_jsLoader->returnMultiColumnWizardArray($pathLoadedFiles, unserialize($savedFiles), $removeExternalFiles);
4544
}
4645

src/Resources/contao/languages/de/tl_layout.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
$GLOBALS['TL_LANG'][TABLE_NAME]['fileLazyLoaderJsFiles'] = ['Javascript-Dateien', ''];
1010
$GLOBALS['TL_LANG'][TABLE_NAME]['fileLazyLoaderModifyExtJs'] = ['Modifizieren', ''];
1111

12+
$GLOBALS['TL_LANG'][TABLE_NAME]['js_select'] = ["Aktiv"];
13+
$GLOBALS['TL_LANG'][TABLE_NAME]['js_files_path'] = ["Pfad"];
14+
$GLOBALS['TL_LANG'][TABLE_NAME]['js_minimize'] = ["Komprimieren"];
15+
$GLOBALS['TL_LANG'][TABLE_NAME]['js_files_path_min'] = [""];
16+
$GLOBALS['TL_LANG'][TABLE_NAME]['js_param'] = ["Parameter"];
17+
18+
1219
// Style Loader
1320
$GLOBALS['TL_LANG'][TABLE_NAME]['fileLazyLoader_files_style_legend'] = 'FileLazyLoader - CSS';
1421

0 commit comments

Comments
 (0)