|
@@ -16,7 +16,7 @@ var scripts = document.getElementsByTagName('script'),
|
|
|
|
|
|
|
|
|
|
var tarteaucitron = {
|
|
var tarteaucitron = {
|
|
- "version": 20180910,
|
|
|
|
|
|
+ "version": 20180911002,
|
|
"cdn": cdn,
|
|
"cdn": cdn,
|
|
"user": {},
|
|
"user": {},
|
|
"lang": {},
|
|
"lang": {},
|
|
@@ -289,7 +289,7 @@ var tarteaucitron = {
|
|
html += ' </button>';
|
|
html += ' </button>';
|
|
html += ' </div>';
|
|
html += ' </div>';
|
|
html += ' </div>';
|
|
html += ' </div>';
|
|
- html += ' <div class="tarteaucitronBorder" id="tarteaucitronScrollbarParent">';
|
|
|
|
|
|
+ html += ' <div class="tarteaucitronBorder">';
|
|
html += ' <div class="clear"></div><ul>';
|
|
html += ' <div class="clear"></div><ul>';
|
|
for (i = 0; i < cat.length; i += 1) {
|
|
for (i = 0; i < cat.length; i += 1) {
|
|
html += ' <li id="tarteaucitronServicesTitle_' + cat[i] + '" class="tarteaucitronHidden">';
|
|
html += ' <li id="tarteaucitronServicesTitle_' + cat[i] + '" class="tarteaucitronHidden">';
|
|
@@ -932,20 +932,20 @@ var tarteaucitron = {
|
|
if (document.getElementById('tarteaucitron') !== null && document.getElementById('tarteaucitronClosePanel') !== null && document.getElementById('tarteaucitronMainLineOffset') !== null) {
|
|
if (document.getElementById('tarteaucitron') !== null && document.getElementById('tarteaucitronClosePanel') !== null && document.getElementById('tarteaucitronMainLineOffset') !== null) {
|
|
|
|
|
|
// reset
|
|
// reset
|
|
- tarteaucitron.userInterface.css('tarteaucitronScrollbarParent', 'height', 'auto');
|
|
|
|
|
|
+ tarteaucitron.userInterface.css('tarteaucitronServices', 'height', 'auto');
|
|
|
|
|
|
// calculate
|
|
// calculate
|
|
mainHeight = document.getElementById('tarteaucitron').offsetHeight;
|
|
mainHeight = document.getElementById('tarteaucitron').offsetHeight;
|
|
closeButtonHeight = document.getElementById('tarteaucitronClosePanel').offsetHeight;
|
|
closeButtonHeight = document.getElementById('tarteaucitronClosePanel').offsetHeight;
|
|
- headerHeight = document.getElementById('tarteaucitronMainLineOffset').offsetHeight;
|
|
|
|
|
|
|
|
// apply
|
|
// apply
|
|
- servicesHeight = (mainHeight - closeButtonHeight - headerHeight + 1);
|
|
|
|
- tarteaucitron.userInterface.css('tarteaucitronScrollbarParent', 'height', servicesHeight + 'px');
|
|
|
|
|
|
+ servicesHeight = (mainHeight - closeButtonHeight + 2);
|
|
|
|
+ tarteaucitron.userInterface.css('tarteaucitronServices', 'height', servicesHeight + 'px');
|
|
|
|
+ tarteaucitron.userInterface.css('tarteaucitronServices', 'overflow-x', 'auto');
|
|
}
|
|
}
|
|
|
|
|
|
// align the main allow/deny button depending on scrollbar width
|
|
// align the main allow/deny button depending on scrollbar width
|
|
- if (document.getElementById('tarteaucitronScrollbarParent') !== null && document.getElementById('tarteaucitronScrollbarChild') !== null) {
|
|
|
|
|
|
+ if (document.getElementById('tarteaucitronServices') !== null && document.getElementById('tarteaucitronScrollbarChild') !== null) {
|
|
|
|
|
|
// media query
|
|
// media query
|
|
if (e[a + 'Width'] <= 479) {
|
|
if (e[a + 'Width'] <= 479) {
|
|
@@ -954,7 +954,7 @@ var tarteaucitron = {
|
|
scrollbarMarginRight = 12;
|
|
scrollbarMarginRight = 12;
|
|
}
|
|
}
|
|
|
|
|
|
- scrollbarWidthParent = document.getElementById('tarteaucitronScrollbarParent').offsetWidth;
|
|
|
|
|
|
+ scrollbarWidthParent = document.getElementById('tarteaucitronServices').offsetWidth;
|
|
scrollbarWidthChild = document.getElementById('tarteaucitronScrollbarChild').offsetWidth;
|
|
scrollbarWidthChild = document.getElementById('tarteaucitronScrollbarChild').offsetWidth;
|
|
tarteaucitron.userInterface.css('tarteaucitronScrollbarAdjust', 'marginRight', ((scrollbarWidthParent - scrollbarWidthChild) + scrollbarMarginRight) + 'px');
|
|
tarteaucitron.userInterface.css('tarteaucitronScrollbarAdjust', 'marginRight', ((scrollbarWidthParent - scrollbarWidthChild) + scrollbarMarginRight) + 'px');
|
|
}
|
|
}
|