Skip to content

Commit

Permalink
Version preps
Browse files Browse the repository at this point in the history
  • Loading branch information
@coastforge-mei
coastforge-mei committed Apr 12, 2023
1 parent 5ea5eec commit 7bd1b1d
Show file tree
Hide file tree
Showing 71 changed files with 1,276 additions and 718 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"require": {
"php": "^7.4 || ^8.0",
"con4gis/core": "^6.0.22",
"con4gis/core": "^7.0.0",
"phayes/geophp": "^1.2",
"menatwork/contao-multicolumnwizard-bundle": "^3.6",
"mobiledetect/mobiledetectlib": "^3.74"
Expand Down
1,634 changes: 950 additions & 684 deletions package-lock.json
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
},
"homepage": "https://github.com/Kuestenschmiede/MapsBundle#readme",
"devDependencies": {
"@babel/core": "^7.21.0",
"@babel/core": "^7.21.4",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-modules-commonjs": "^7.21.2",
"@babel/plugin-transform-react-jsx": "^7.21.0",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/plugin-transform-runtime": "^7.21.4",
"@babel/polyfill": "^7.12.1",
"@babel/preset-env": "^7.19.4",
"@babel/preset-env": "^7.21.4",
"babel-loader": "^8.2.5",
"clean-webpack-plugin": "^3.0.0",
"echo-loader": "0.0.1",
Expand All @@ -50,12 +50,12 @@
"gulp-sass": "^5.1.0",
"gulp-sourcemaps": "^2.6.5",
"gulp-uglify": "^3.0.2",
"sass": "^1.58.3",
"webpack": "^5.77.0",
"sass": "^1.62.0",
"webpack": "^5.78.0",
"webpack-cli": "^4.10.0"
},
"dependencies": {
"@babel/plugin-syntax-jsx": "^7.18.6",
"@babel/plugin-syntax-jsx": "^7.21.4",
"@babel/preset-react": "^7.18.6",
"@babel/runtime": "^7.21.0",
"@fortawesome/fontawesome-free": "^5.15.4",
Expand All @@ -68,7 +68,7 @@
"moment": "^2.29.4",
"ol": "^7.3.0",
"ol-cesium": "^2.13.1",
"ol-ext": "^4.0.6",
"ol-ext": "^4.0.7",
"ol-mapbox-style": "^9.7.0",
"opening_hours": "^3.8.0",
"proj4": "^2.8.1",
Expand Down
15 changes: 8 additions & 7 deletions src/Resources/contao/dca/tl_c4g_map_locstyles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
use Contao\Message;
if (method_exists('System', 'getContainer')) {
$filteredSizes = [];
$imageSizes = System::getContainer()->get('contao.image.image_sizes')->getAllOptions();
$imageSizes = System::getContainer() && System::getContainer()->get('contao.image.image_sizes') ? System::getContainer()->get('contao.image.image_sizes')->getAllOptions() : false;
$just = 'proportional';
if ($imageSizes) {

if ($imageSizes !== false) {
foreach ($imageSizes as $group => $sizes) {
foreach ($sizes as $key => $size) {
if ($size == $just) {
Expand Down Expand Up @@ -201,7 +202,7 @@
'exclude' => true,
'default' => ['0','0'],
'inputType' => 'imageSize',
'options' => $imageSizes,
'options' => $imageSizes ?: [],
'eval' => ['rgxp'=>'digit', 'tl_class'=>'long'],
'sql' => "varchar(100) NOT NULL default ''"
],
Expand Down Expand Up @@ -273,7 +274,7 @@
'exclude' => true,
'default' => ['0','0'],
'inputType' => 'imageSize',
'options' => $imageSizes,
'options' => $imageSizes ?: [],
'eval' => ['rgxp'=>'digit', 'tl_class'=>'long'],
'sql' => "varchar(100) NOT NULL default ''"
],
Expand Down Expand Up @@ -366,7 +367,7 @@
'exclude' => true,
'default' => ['0','0'],
'inputType' => 'imageSize',
'options' => $imageSizes,
'options' => $imageSizes ?: [],
'eval' => ['rgxp'=>'digit', 'tl_class'=>'clr'],
'sql' => "varchar(100) NOT NULL default ''"
],
Expand Down Expand Up @@ -474,7 +475,7 @@
'default' => ['200','200'],
'exclude' => true,
'inputType' => 'imageSize',
'options' => $imageSizes,
'options' => $imageSizes ?: [],
'eval' => ['rgxp'=>'digit', 'tl_class'=>'w50', 'mandatory'=>true],
'sql' => "varchar(100) NOT NULL default ''"
],
Expand All @@ -483,7 +484,7 @@
'exclude' => true,
'default' => ['0','0'],
'inputType' => 'imageSize',
'options' => $imageSizes,
'options' => $imageSizes ?: [],
'eval' => ['rgxp'=>'digit', 'tl_class'=>'w50'],
'sql' => "varchar(100) NOT NULL default ''"
],
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/public/build/c4g-backend-editor.js
View file

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions src/Resources/public/build/c4g-backend-editor.js.LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/*
* This file is part of con4gis, the gis-kit for Contao CMS.
* @package con4gis
* @version 8
* @author con4gis contributors (see "authors.txt")
* @license LGPL-3.0-or-later
* @copyright (c) 2010-2022, by Küstenschmiede GmbH Software & Design
* @link https://www.con4gis.org
*/

/*
* This file is part of con4gis, the gis-kit for Contao CMS.
* @package con4gis
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/public/build/c4g-maps.js
View file

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions src/Resources/public/build/c4g-search.js.LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/*
* This file is part of con4gis, the gis-kit for Contao CMS.
* @package con4gis
* @version 8
* @author con4gis contributors (see "authors.txt")
* @license LGPL-3.0-or-later
* @copyright (c) 2010-2022, by Küstenschmiede GmbH Software & Design
* @link https://www.con4gis.org
*/

/*
* This file is part of con4gis, the gis-kit for Contao CMS.
* @package con4gis
Expand Down
Loading

0 comments on commit 7bd1b1d

Please sign in to comment.