polynux
/
tarteauxmyrtilles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't show the hashtag but continu to open the panel if he's present

This commit is contained in:
Amauri CHAMPEAUX 2015-03-07 01:34:41 +01:00
parent b8649717fa
commit 9e16b59381
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/tarteaucitron.css
View File

@ -330,7 +330,7 @@
right: 0; right: 0;
text-align: center; text-align: center;
width: auto; width: auto;
z-index: 2147483645; z-index: 2147483646;
} }
#tarteaucitronAlertSmall #tarteaucitronManager { #tarteaucitronAlertSmall #tarteaucitronManager {

18
tarteaucitron.js
View File

@ -10,7 +10,7 @@ var scripts = document.getElementsByTagName('script'),
tarteaucitronNoAdBlocker = false; tarteaucitronNoAdBlocker = false;
var tarteaucitron = { var tarteaucitron = {
"version": 155, "version": 156,
"cdn": cdn, "cdn": cdn,
"user": {}, "user": {},
"lang": {}, "lang": {},
@ -529,17 +529,16 @@ var tarteaucitron = {
tarteaucitron.userInterface.css('tarteaucitron', 'display', 'block'); tarteaucitron.userInterface.css('tarteaucitron', 'display', 'block');
tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'block'); tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'block');
tarteaucitron.userInterface.css('tarteaucitronCookiesListContainer', 'display', 'none'); tarteaucitron.userInterface.css('tarteaucitronCookiesListContainer', 'display', 'none');
// setting hash tag
if (tarteaucitron.hashtag !== '') {
document.location.hash = tarteaucitron.hashtag;
}
}, },
"closePanel": function () { "closePanel": function () {
"use strict"; "use strict";
tarteaucitron.userInterface.css('tarteaucitron', 'display', 'none'); tarteaucitron.userInterface.css('tarteaucitron', 'display', 'none');
tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'none'); tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'none');
document.location.hash = ''; tarteaucitron.userInterface.css('tarteaucitronCookiesListContainer', 'display', 'none');
if (document.location.hash === tarteaucitron.hashtag) {
document.location.hash = '';
}
}, },
"openAlert": function () { "openAlert": function () {
"use strict"; "use strict";
@ -563,9 +562,14 @@ var tarteaucitron = {
tarteaucitron.userInterface.css('tarteaucitronCookiesListContainer', 'bottom', (parseInt(document.getElementById('tarteaucitronAlertSmall').offsetHeight, 10) + 10) + 'px'); tarteaucitron.userInterface.css('tarteaucitronCookiesListContainer', 'bottom', (parseInt(document.getElementById('tarteaucitronAlertSmall').offsetHeight, 10) + 10) + 'px');
if (div.style.display !== 'block') { if (div.style.display !== 'block') {
tarteaucitron.cookie.number();
div.style.display = 'block'; div.style.display = 'block';
tarteaucitron.userInterface.css('tarteaucitron', 'display', 'none');
tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'block');
} else { } else {
div.style.display = 'none'; div.style.display = 'none';
tarteaucitron.userInterface.css('tarteaucitron', 'display', 'none');
tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'none');
} }
}, },
"order": function (id) { "order": function (id) {