Merge branch 'hotfix/2.4.2'

.gitignore

@@ -12,6 +12,7 @@
 # Isotope ignoring rules
 !isotope/
 isotope/*
+!isotope/.htaccess
 !isotope/index.html
 !system/
 system/*

composer.json

@@ -38,7 +38,8 @@
         "terminal42/contao-fineuploader": "For file uploads in frontend using FineUploader"
     },
     "conflict": {
-        "terminal42/contao-fineuploader": "< 2.0 || >= 3.0"
+        "terminal42/contao-fineuploader": "< 2.0 || >= 3.0",
+        "contao/core-bundle": "4.0.0 || 4.0.1"
     },
     "autoload": {
         "psr-0": {

system/modules/isotope/assets/css/backend.css

@@ -4,6 +4,11 @@
     background-size: 16px 16px;
 }
 
+body[class*="version_4-4"] #tl_navigation .tl_level_1_group .group-isotope {
+    background: url(../images/module44.svg) 5px 1px no-repeat;
+    background-size: 14px 14px;
+}
+
 .header_import_assets
 {
     padding:2px 0 3px 20px;
@@ -40,7 +45,7 @@
     padding:3px 0 0 8px;
 }
 
-body.popup .header_back {
+body.popup a[href*="table=tl_iso_attribute_option"].header_back {
     display: none;
 }
 
@@ -425,7 +430,3 @@ body.iso_be_overview .tip-wrap{
     float:left;
     margin-left:20px;
 }
-
-.tl_version_panel.tl_iso_products_panel #tl_version {
-    float: right;
-}

system/modules/isotope/assets/js/backend.js

@@ -99,21 +99,22 @@ var Isotope = {};
                 if (!inp[i].checked || inp[i].id.match(/^check_all_/)) continue;
                 if (!inp[i].id.match(/^reset_/)) val.push(inp[i].get('value'));
             }
-            new Request.Contao(
-            {
+            new Request.Contao({
                 evalScripts: false,
                 onRequest: AjaxRequest.displayBox(Contao.lang.loading + ' …'),
-                onSuccess: function(txt, json)
-                {
-                    if (txt != '')
-                    {
+                onSuccess: function(txt, json) {
+                    if (txt != '') {
                         window.location.href = txt;
                     }
+                },
+                onFailure: function(xhr) {
+                    if (xhr.status === 302 && xhr.responseText != '') {
+                        window.location.href = xhr.responseText;
+                    }
                 }
             }).post({'action':opt.action, 'value':val[0], 'redirect':opt.redirect, 'REQUEST_TOKEN':Contao.request_token});
             this.hide();
-            if (opt.trigger)
-            {
+            if (opt.trigger) {
                 opt.trigger.fireEvent('closeModal');
             }
         });
@@ -181,12 +182,15 @@ var Isotope = {};
             {
                 evalScripts: false,
                 onRequest: AjaxRequest.displayBox(Contao.lang.loading + ' …'),
-                onSuccess: function(txt, json)
-                {
-                    if (txt != '')
-                    {
+                onSuccess: function(txt, json) {
+                    if (txt != '') {
                         window.location.href = txt;
                     }
+                },
+                onFailure: function(xhr) {
+                    if (xhr.status === 302 && xhr.responseText != '') {
+                        window.location.href = xhr.responseText;
+                    }
                 }
             }).post({'action':opt.action, 'value':val, 'redirect':opt.redirect, 'REQUEST_TOKEN':Contao.request_token});
             this.hide();