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

Feature: Modify verification of tarteaucitronExpireInDay type's value

This commit is contained in:
Alexis Besson 2019-04-08 11:46:11 +02:00
parent fb2b675889
commit 9f3873303d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tarteaucitron.js
View File

@ -10,7 +10,7 @@ var scripts = document.getElementsByTagName('script'),
tarteaucitronForceExpire = (tarteaucitronForceExpire === undefined) ? '' : tarteaucitronForceExpire, tarteaucitronForceExpire = (tarteaucitronForceExpire === undefined) ? '' : tarteaucitronForceExpire,
tarteaucitronCustomText = (tarteaucitronCustomText === undefined) ? '' : tarteaucitronCustomText, tarteaucitronCustomText = (tarteaucitronCustomText === undefined) ? '' : tarteaucitronCustomText,
// tarteaucitronExpireInDay: true for day(s) value - false for hour(s) value // tarteaucitronExpireInDay: true for day(s) value - false for hour(s) value
tarteaucitronExpireInDay = (tarteaucitronExpireInDay === undefined || !Boolean(tarteaucitronExpireInDay)) ? true : tarteaucitronExpireInDay, tarteaucitronExpireInDay = (tarteaucitronExpireInDay === undefined || typeof tarteaucitronExpireInDay !== "boolean") ? true : tarteaucitronExpireInDay,
timeExpire = 31536000000, timeExpire = 31536000000,
tarteaucitronProLoadServices, tarteaucitronProLoadServices,
tarteaucitronNoAdBlocker = false; tarteaucitronNoAdBlocker = false;
@ -1058,7 +1058,7 @@ var tarteaucitron = {
"use strict"; "use strict";
if (tarteaucitronForceExpire !== '') { if (tarteaucitronForceExpire !== '') {
// The number of day can't be higher than 1 year // The number of day(s)/hour(s) can't be higher than 1 year
if ((tarteaucitronExpireInDay && tarteaucitronForceExpire < 365) || (!tarteaucitronExpireInDay && tarteaucitronForceExpire < 8760)) { if ((tarteaucitronExpireInDay && tarteaucitronForceExpire < 365) || (!tarteaucitronExpireInDay && tarteaucitronForceExpire < 8760)) {
if (tarteaucitronExpireInDay) { if (tarteaucitronExpireInDay) {
// Multiplication to tranform the number of days to milliseconds // Multiplication to tranform the number of days to milliseconds