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

move utility function in tarteaucitron

This commit is contained in:
Ricci Dorian 2018-07-30 19:47:12 +02:00
parent a59ee49abb
commit 1ea7bfa82a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tarteaucitron.js
View File

@ -12,19 +12,7 @@ var scripts = document.getElementsByTagName('script'),
tarteaucitronProLoadServices, tarteaucitronProLoadServices,
tarteaucitronNoAdBlocker = false; tarteaucitronNoAdBlocker = false;
/**
Utility function to Add or update the fields of obj1 with the ones in obj2
*/
function AddOrUpdate(obj1, obj2){
for(key in obj2){
if(obj2[key] instanceof Object){
obj1[key] = AddOrUpdate(obj1[key], obj2[key]);
}else{
obj1[key] = obj2[key];
}
}
return obj1;
}
var tarteaucitron = { var tarteaucitron = {
"version": 323, "version": 323,
@ -226,7 +214,7 @@ var tarteaucitron = {
tarteaucitron.addScript(pathToLang, '', function () { tarteaucitron.addScript(pathToLang, '', function () {
if(tarteaucitronCustomText !== ''){ if(tarteaucitronCustomText !== ''){
tarteaucitron.lang = AddOrUpdate(tarteaucitron.lang, tarteaucitronCustomText); tarteaucitron.lang = tarteaucitron.AddOrUpdate(tarteaucitron.lang, tarteaucitronCustomText);
} }
tarteaucitron.addScript(pathToServices, '', function () { tarteaucitron.addScript(pathToServices, '', function () {
@ -1304,5 +1292,18 @@ var tarteaucitron = {
} }
tarteaucitron.cookie.number(); tarteaucitron.cookie.number();
},
"AddOrUpdate" : function AddOrUpdate(source, custom){
/**
Utility function to Add or update the fields of obj1 with the ones in obj2
*/
for(key in custom){
if(custom[key] instanceof Object){
source[key] = AddOrUpdate(source[key], custom[key]);
}else{
source[key] = custom[key];
}
}
return source;
} }
}; };