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

Merge pull request #685 from mapado/nr-fix_missing_var_declaratino 

Missing some var declarations
This commit is contained in:
Amauri CHAMPEAUX 2021-06-01 18:58:26 +02:00 committed by GitHub
parent d3b6f63e5b 3fb12315ec
commit 3d9c71c48c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tarteaucitron.js
View File

@ -293,7 +293,7 @@ var tarteaucitron = {
} }
document.getElementsByTagName('head')[0].appendChild(customThemePopup); document.getElementsByTagName('head')[0].appendChild(customThemePopup);
} }
var body = document.body, var body = document.body,
div = document.createElement('div'), div = document.createElement('div'),
html = '', html = '',
@ -660,7 +660,7 @@ var tarteaucitron = {
// add a little timeout to be sure everything is accessible // add a little timeout to be sure everything is accessible
setTimeout(function () { setTimeout(function () {
// Setup events // Setup events
tarteaucitron.addClickEventToId("tarteaucitronCloseCross", function () { tarteaucitron.addClickEventToId("tarteaucitronCloseCross", function () {
tarteaucitron.userInterface.closeAlert(); tarteaucitron.userInterface.closeAlert();
@ -735,7 +735,7 @@ var tarteaucitron = {
tarteaucitron.events.load(); tarteaucitron.events.load();
} }
}, 500); }, 500);
}); });
}); });
}, },
@ -909,12 +909,12 @@ var tarteaucitron = {
} else { } else {
document.getElementById(id).style[property] = value; document.getElementById(id).style[property] = value;
if (property == "display" && value == "block" && (id == "tarteaucitron" || id == "tarteaucitronAlertBig")) { if (property == "display" && value == "block" && (id == "tarteaucitron" || id == "tarteaucitronAlertBig")) {
document.getElementById(id).style["opacity"] = "0"; document.getElementById(id).style["opacity"] = "0";
setTimeout(function() {document.getElementById(id).style["opacity"] = "1";}, 1); setTimeout(function() {document.getElementById(id).style["opacity"] = "1";}, 1);
} }
if (property == "display" && value == "block" && id == "tarteaucitronBack") { if (property == "display" && value == "block" && id == "tarteaucitronBack") {
document.getElementById(id).style["opacity"] = "0"; document.getElementById(id).style["opacity"] = "0";
setTimeout(function() {document.getElementById(id).style["opacity"] = "0.7";}, 1); setTimeout(function() {document.getElementById(id).style["opacity"] = "0.7";}, 1);
@ -1111,10 +1111,10 @@ var tarteaucitron = {
groupallowed = 0; groupallowed = 0;
for (var ii = 0; ii < doc.children.length; ii++) { for (var ii = 0; ii < doc.children.length; ii++) {
if (doc.children[ii].className == "tarteaucitronLine tarteaucitronIsDenied") { if (doc.children[ii].className == "tarteaucitronLine tarteaucitronIsDenied") {
groupdenied++; groupdenied++;
} }
if (doc.children[ii].className == "tarteaucitronLine tarteaucitronIsAllowed") { if (doc.children[ii].className == "tarteaucitronLine tarteaucitronIsAllowed") {
groupallowed++; groupallowed++;
} }
} }
if (total === groupallowed) { if (total === groupallowed) {
@ -1129,8 +1129,8 @@ var tarteaucitron = {
tarteaucitron.userInterface.removeClass('tarteaucitron-group-'+cat, 'tarteaucitronIsDenied'); tarteaucitron.userInterface.removeClass('tarteaucitron-group-'+cat, 'tarteaucitronIsDenied');
tarteaucitron.userInterface.removeClass('tarteaucitron-group-'+cat, 'tarteaucitronIsAllowed'); tarteaucitron.userInterface.removeClass('tarteaucitron-group-'+cat, 'tarteaucitronIsAllowed');
} }
groupdenied = 0; groupdenied = 0;
groupallowed = 0; groupallowed = 0;
}); });
}, },
@ -1940,7 +1940,7 @@ var tarteaucitron = {
/** /**
Utility function to Add or update the fields of obj1 with the ones in obj2 Utility function to Add or update the fields of obj1 with the ones in obj2
*/ */
for(key in custom){ for(var key in custom){
if(custom[key] instanceof Object){ if(custom[key] instanceof Object){
source[key] = tarteaucitron.AddOrUpdate(source[key], custom[key]); source[key] = tarteaucitron.AddOrUpdate(source[key], custom[key]);
}else{ }else{

2
tarteaucitron.services.js
View File

@ -1872,6 +1872,7 @@ tarteaucitron.services.googlemaps = {
return '<div id="' + uniqId + '" zoom="' + x.getAttribute('zoom') + '" latitude="' + x.getAttribute('latitude') + '" longitude="' + x.getAttribute('longitude') + '" style="width:' + x.offsetWidth + 'px;height:' + x.offsetHeight + 'px"></div>'; return '<div id="' + uniqId + '" zoom="' + x.getAttribute('zoom') + '" latitude="' + x.getAttribute('latitude') + '" longitude="' + x.getAttribute('longitude') + '" style="width:' + x.offsetWidth + 'px;height:' + x.offsetHeight + 'px"></div>';
}); });
var i;
for (i = 0; i < uniqIds.length; i += 1) { for (i = 0; i < uniqIds.length; i += 1) {
mapOptions = { mapOptions = {
zoom: parseInt(document.getElementById(uniqIds[i]).getAttribute('zoom'), 10), zoom: parseInt(document.getElementById(uniqIds[i]).getAttribute('zoom'), 10),
@ -2847,6 +2848,7 @@ tarteaucitron.services.twitterembed = {
}); });
tarteaucitron.addScript('//platform.twitter.com/widgets.js', 'twitter-wjs', function () { tarteaucitron.addScript('//platform.twitter.com/widgets.js', 'twitter-wjs', function () {
var i;
for (i = 0; i < uniqIds.length; i += 1) { for (i = 0; i < uniqIds.length; i += 1) {
e = document.getElementById(uniqIds[i]); e = document.getElementById(uniqIds[i]);
twttr.widgets.createTweet( twttr.widgets.createTweet(