Skip to content

Commit 62f947c

Browse files
committed
Merge branch 'hotfix/3.2.15' into hotfix/3.3.6
Conflicts: assets/contao/css/layout.css assets/contao/js/core-uncompressed.js assets/contao/js/core.js assets/mootools/core/1.5.1/mootools-request-uncompressed.js system/config/constants.php system/modules/core/drivers/DC_Table.php system/modules/core/library/Contao/ModuleLoader.php system/modules/core/vendor/phpdiff/Diff/Renderer/Html/Contao.php system/themes/default/basic.css
2 parents d8485fe + 864389c commit 62f947c

40 files changed

+855
-332
lines changed

assets/contao/css/layout-uncompressed.css

+7-6
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,14 @@ select,input,textarea {
107107
* Hide invisible elements
108108
*/
109109
.invisible {
110-
width:0;
111-
height:0;
112-
left:-1000px;
113-
top:-1000px;
114-
position:absolute;
110+
border:0;
111+
clip:rect(0 0 0 0);
112+
height:1px;
113+
margin:-1px;
115114
overflow:hidden;
116-
display:inline;
115+
padding:0;
116+
position:absolute;
117+
width:1px;
117118
}
118119

119120
/**

assets/contao/css/layout.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/contao/js/core-uncompressed.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -856,8 +856,8 @@ var Backend =
856856
this.hide();
857857
});
858858
M.addButton(Contao.lang.apply, 'btn primary', function() {
859-
var val = [],
860-
frm = window.frames['simple-modal-iframe'];
859+
var frm = window.frames['simple-modal-iframe'],
860+
val = [], inp, i;
861861
if (frm === undefined) {
862862
alert('Could not find the SimpleModal frame');
863863
return;
@@ -866,8 +866,8 @@ var Backend =
866866
alert(Contao.lang.picker);
867867
return; // see #5704
868868
}
869-
var inp = frm.document.getElementById('tl_listing').getElementsByTagName('input');
870-
for (var i=0; i<inp.length; i++) {
869+
inp = frm.document.getElementById('tl_listing').getElementsByTagName('input');
870+
for (i=0; i<inp.length; i++) {
871871
if (!inp[i].checked || inp[i].id.match(/^check_all_/)) continue;
872872
if (!inp[i].id.match(/^reset_/)) val.push(inp[i].get('value'));
873873
}

assets/contao/js/core.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/mootools/core/1.5.0/mootools-core.js

-2
This file was deleted.

assets/mootools/core/1.5.0/mootools-mobile.js

-2
This file was deleted.

assets/mootools/core/1.5.0/mootools-more.js

-2
This file was deleted.

assets/mootools/core/1.5.0/mootools.js

-6
This file was deleted.

0 commit comments

Comments
 (0)