diff --git a/.github/workflows/diagnostics.yml b/.github/workflows/diagnostics.yml index 315d6ac..2321a8d 100644 --- a/.github/workflows/diagnostics.yml +++ b/.github/workflows/diagnostics.yml @@ -17,16 +17,14 @@ jobs: fail-fast: false matrix: include: - - php: 7.4 - phpcq_install: 'install' - - php: 8.0 + - php: 8.2 phpcq_install: 'update' - - php: 8.1 + - php: 8.3 phpcq_install: 'update' steps: - name: Pull source - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP with PECL extension uses: shivammathur/setup-php@v2 @@ -42,7 +40,7 @@ jobs: key: ${{ runner.os }}-build-${{ env.cache-name }} - name: Cache vendor directory - uses: actions/cache@v1 + uses: actions/cache@v3 env: cache-name: vendor-${{ matrix.php }} with: @@ -52,7 +50,7 @@ jobs: ${{ runner.os }}-build-${{ env.cache-name }}- - name: Cache phpcq directory - uses: actions/cache@v1 + uses: actions/cache@v3 env: cache-name: phpcq-${{ matrix.php }} with: @@ -71,7 +69,7 @@ jobs: run: ./vendor/bin/phpcq run -v -o github-action -o default --threshold=info - name: Upload build directory to artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ success() }} || ${{ failure() }} with: name: phpcq-builds-php-${{ matrix.php }} diff --git a/composer.json b/composer.json index 23effe0..9db8190 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "symfony/http-foundation": "^5.4 || ^6.4", "symfony/http-kernel": "^5.4 || ^6.4", "symfony/translation-contracts": "^1.0 || ^2.0 || ^3.0", - "terminal42/dcawizard": "^3.0" + "terminal42/dcawizard": "^2.7 || ^3.0" }, "require-dev": { "contao/manager-plugin": "^2.1", @@ -74,8 +74,8 @@ }, "extra": { "branch-alias": { - "dev-2.x": "2.1.x-dev", - "dev-master": "3.0.x-dev" + "dev-master": "4.0.x-dev", + "dev-develop": "4.1.x-dev" }, "contao-manager-plugin": "Hofff\\Contao\\Content\\ContaoManager\\Plugin" } diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php index 1f4332e..a60dcc4 100644 --- a/src/Resources/contao/config/config.php +++ b/src/Resources/contao/config/config.php @@ -4,7 +4,5 @@ $GLOBALS['BE_MOD']['content']['article']['stylesheet'][] = 'bundles/hofffcontaocontent/css/hofff_content.css'; $GLOBALS['BE_MOD']['design']['themes']['stylesheet'][] = 'bundles/hofffcontaocontent/css/hofff_content.css'; -$GLOBALS['BE_MOD']['content']['article']['javascript'][] = 'bundles/hofffcontaocontent/js/hofff_content.js'; -$GLOBALS['BE_MOD']['design']['themes']['javascript'][] = 'bundles/hofffcontaocontent/js/hofff_content.js'; $GLOBALS['BE_MOD']['design']['themes']['tables'][] = 'tl_hofff_content'; diff --git a/src/Resources/public/js/hofff_content.js b/src/Resources/public/js/hofff_content.js deleted file mode 100644 index a981264..0000000 --- a/src/Resources/public/js/hofff_content.js +++ /dev/null @@ -1,28 +0,0 @@ -(function($) { - window.addEvent("domready", function() { - if(!window.Hofff || !Hofff.Selectri) return; - - $(document.body).addEvent("click:relay(a.hofff-content-edit)", function(event, $target) { - event.preventDefault(); - - Backend.openModalIframe({ - width: 768, - title: $target.get("data-title"), - url: $target.get("href") + "&popup=1&nb=1" - }); - }); - - Hofff.Selectri.scan(); - - $$(".hofff-selectri-widget.hofff-content").each(function(selectri) { - selectri = new Hofff.Selectri(selectri); - selectri.selection.getElements(".hofff-content-html").each(function($html) { - $html.getParent().set("html", $html.get("data-hofff-content-html")); - }); - selectri.addEvent("selected", function(key) { - $html = selectri.getNode(selectri.selection, key).getElement(".hofff-content-html"); - $html.getParent().set("html", $html.get("data-hofff-content-html")); - }); - }); - }); -})(document.id);