From 3a59279522ec5d014068e02cfce9fd143be044c2 Mon Sep 17 00:00:00 2001 From: "Emanuele \"ToX\" Toscano" Date: Thu, 10 Dec 2015 11:52:38 +0100 Subject: [PATCH] Switched back to freegeoip --- cookiebar-latest.js | 8 ++++---- cookiebar-latest.min.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cookiebar-latest.js b/cookiebar-latest.js index 6ee0c7a..a88b079 100644 --- a/cookiebar-latest.js +++ b/cookiebar-latest.js @@ -3,7 +3,7 @@ Plugin URL: http://cookie-bar.eu/ @author: Emanuele "ToX" Toscano @description: Cookie Bar is a free & simple solution to the EU cookie law. - @version: 1.5.4 + @version: 1.5.5 */ /* @@ -85,7 +85,7 @@ function setupCookieBar() { */ var checkEurope = new XMLHttpRequest(); - checkEurope.open('GET', '//www.telize.com/geoip', true); + checkEurope.open('GET', '//freegeoip.net/json/', true); checkEurope.onreadystatechange = function() { if (checkEurope.readyState === 4 && checkEurope.status === 200) { clearTimeout(xmlHttpTimeout); @@ -114,14 +114,14 @@ function setupCookieBar() { /* * Using an external service for geoip localization could be a long task - * If it takes more than 1 second, start normally + * If it takes more than 1.5 second, start normally * @param null * @return null */ var xmlHttpTimeout = setTimeout(ajaxTimeout, 1500); function ajaxTimeout() { checkEurope.abort(); - console.log('cookieBAR - Timeout for ip geolocalion'); + console.log('cookieBAR - Timeout for ip geolocation'); if (document.cookie.length > 0 || window.localStorage.length > 0) { var accepted = getCookie(); diff --git a/cookiebar-latest.min.js b/cookiebar-latest.min.js index b7bacdb..93ef8a2 100644 --- a/cookiebar-latest.min.js +++ b/cookiebar-latest.min.js @@ -1 +1 @@ -function setupCookieBar(){function e(){if(h.abort(),console.log("cookieBAR - Timeout for ip geolocalion"),document.cookie.length>0||window.localStorage.length>0){var e=a();void 0===e&&t()}}function t(){var e=n(),t="";m("theme")&&(t="-"+m("theme"));var o=B.replace(/[^\/]*$/,""),a=document.createElement("link");a.setAttribute("rel","stylesheet"),a.setAttribute("href",o+"cookiebar"+t+".css"),document.head.appendChild(a);var i=new XMLHttpRequest;i.open("GET",o+"/lang/"+e+".html",!0),i.onreadystatechange=function(){if(4===i.readyState&&200===i.status){var e=document.createElement("div");if(e.innerHTML=i.responseText,document.getElementsByTagName("body")[0].appendChild(e),g=document.getElementById("cookie-bar"),p=document.getElementById("cookie-bar-button"),y=document.getElementById("cookie-bar-button-no"),k=document.getElementById("cookie-bar-prompt"),v=document.getElementById("cookie-bar-prompt-button"),b=document.getElementById("cookie-bar-prompt-close"),f=document.getElementById("cookie-bar-prompt-content"),E=document.getElementById("cookie-bar-no-consent"),thirdparty=document.getElementById("cookie-bar-thirdparty"),tracking=document.getElementById("cookie-bar-tracking"),privacyPage=document.getElementById("cookie-bar-privacy-page"),privacyLink=document.getElementById("cookie-bar-privacy-link"),m("showNoConsent")||(E.style.display="none",y.style.display="none"),m("blocking")&&(r(k,500),b.style.display="none"),m("thirdparty")&&(thirdparty.style.display="block"),m("tracking")&&(tracking.style.display="block"),m("top")?(g.style.top=0,d("top")):(g.style.bottom=0,d("bottom")),m("privacyPage")){var t=decodeURIComponent(m("privacyPage"));privacyLink.href=t,privacyPage.style.display="inline-block"}u(),r(g,250),d()}},i.send()}function o(){for(var e=document.getElementsByTagName("script"),t=0;t-1)return o}}function n(){var e=m("forceLang");return e===!1&&(e=navigator.language||navigator.userLanguage),e=e.substr(0,2),CookieLanguages.indexOf(e)<0&&(e="en"),e}function a(){var e=document.cookie.match(/(;)?cookiebar=([^;]*);?/);return null==e?void 0:decodeURI(e)[2]}function i(e,t){var o=30;m("remember")&&(o=m("remember"));var n=new Date;n.setDate(n.getDate()+parseInt(o));var a=encodeURI(t)+(null===o?"":"; expires="+n.toUTCString()+";path=/");document.cookie=e+"="+a}function c(){document.cookie.split(";").forEach(function(e){document.cookie=e.replace(/^ +/,"").replace(/=.*/,"=;expires="+(new Date).toUTCString()+";path=/")}),localStorage.clear()}function r(e,t){var o=e.style;o.opacity=0,o.display="block",function n(){(o.opacity-=-.1)>.9?null:setTimeout(n,t/10)}()}function l(e,t){var o=e.style;o.opacity=1,function n(){(o.opacity-=.1)<.1?o.display="none":setTimeout(n,t/10)}()}function d(e){setTimeout(function(){var t=document.getElementById("cookie-bar").clientHeight;switch(e){case"top":document.getElementsByTagName("body")[0].style.marginTop=t+"px";break;case"bottom":document.getElementsByTagName("body")[0].style.marginBottom=t+"px"}},300)}function s(){var e=document.getElementById("cookie-bar").clientHeight;if(m("top")){var t=parseInt(document.getElementsByTagName("body")[0].style.marginTop);document.getElementsByTagName("body")[0].style.marginTop=t-e+"px"}else{var o=parseInt(document.getElementsByTagName("body")[0].style.marginBottom);document.getElementsByTagName("body")[0].style.marginBottom=o-e+"px"}}function m(e){var t=B.split(e+"=");return t[1]?t[1].split(/[&?]+/)[0]:!1}function u(){p.addEventListener("click",function(){i("cookiebar","CookieAllowed"),s(),l(k,250),l(g,250)}),y.addEventListener("click",function(){var e=E.textContent.trim(),t=window.confirm(e);t===!0&&(c(),i("cookiebar","CookieDisallowed"),s(),l(k,250),l(g,250))}),v.addEventListener("click",function(){r(k,250)}),b.addEventListener("click",function(){l(k,250)})}var g,p,y,k,v,b,f,E,B=o();"CookieDisallowed"==a()&&(c(),i("cookiebar","CookieDisallowed"));var h=new XMLHttpRequest;h.open("GET","//www.telize.com/geoip",!0),h.onreadystatechange=function(){if(4===h.readyState&&200===h.status){clearTimeout(T);var e=JSON.parse(h.responseText).country_code;if(cookieLawStates.indexOf(e)>-1){if(m("always")){var o=a();void 0===o&&t()}else if(document.cookie.length>0||window.localStorage.length>0){var o=a();void 0===o&&t()}}else console.log("cookieBAR - Not an EU user, no cookieBAR.")}},h.send();var T=setTimeout(e,1500)}var CookieLanguages=["en","it","fr","hu","de"],cookieLawStates=["BE","BG","CZ","DK","DE","EE","IE","EL","ES","FR","IT","CY","LV","LT","LU","HU","MT","NL","AT","PL","PT","RO","SI","SK","FI","SE","GB"];document.addEventListener("DOMContentLoaded",function(){setupCookieBar()}); \ No newline at end of file +function setupCookieBar(){function a(){if(w.abort(),console.log("cookieBAR - Timeout for ip geolocation"),document.cookie.length>0||window.localStorage.length>0){var a=e();void 0===a&&b()}}function b(){var a=d(),b="";l("theme")&&(b="-"+l("theme"));var c=v.replace(/[^\/]*$/,""),e=document.createElement("link");e.setAttribute("rel","stylesheet"),e.setAttribute("href",c+"cookiebar"+b+".css"),document.head.appendChild(e);var f=new XMLHttpRequest;f.open("GET",c+"/lang/"+a+".html",!0),f.onreadystatechange=function(){if(4===f.readyState&&200===f.status){var a=document.createElement("div");if(a.innerHTML=f.responseText,document.getElementsByTagName("body")[0].appendChild(a),n=document.getElementById("cookie-bar"),o=document.getElementById("cookie-bar-button"),p=document.getElementById("cookie-bar-button-no"),q=document.getElementById("cookie-bar-prompt"),r=document.getElementById("cookie-bar-prompt-button"),s=document.getElementById("cookie-bar-prompt-close"),t=document.getElementById("cookie-bar-prompt-content"),u=document.getElementById("cookie-bar-no-consent"),thirdparty=document.getElementById("cookie-bar-thirdparty"),tracking=document.getElementById("cookie-bar-tracking"),privacyPage=document.getElementById("cookie-bar-privacy-page"),privacyLink=document.getElementById("cookie-bar-privacy-link"),l("showNoConsent")||(u.style.display="none",p.style.display="none"),l("blocking")&&(h(q,500),s.style.display="none"),l("thirdparty")&&(thirdparty.style.display="block"),l("tracking")&&(tracking.style.display="block"),l("top")?(n.style.top=0,j("top")):(n.style.bottom=0,j("bottom")),l("privacyPage")){var b=decodeURIComponent(l("privacyPage"));privacyLink.href=b,privacyPage.style.display="inline-block"}m(),h(n,250),j()}},f.send()}function c(){for(var a=document.getElementsByTagName("script"),b=0;b-1)return c}}function d(){var a=l("forceLang");return a===!1&&(a=navigator.language||navigator.userLanguage),a=a.substr(0,2),CookieLanguages.indexOf(a)<0&&(a="en"),a}function e(){var a=document.cookie.match(/(;)?cookiebar=([^;]*);?/);return null==a?void 0:decodeURI(a)[2]}function f(a,b){var c=30;l("remember")&&(c=l("remember"));var d=new Date;d.setDate(d.getDate()+parseInt(c));var e=encodeURI(b)+(null===c?"":"; expires="+d.toUTCString()+";path=/");document.cookie=a+"="+e}function g(){document.cookie.split(";").forEach(function(a){document.cookie=a.replace(/^ +/,"").replace(/=.*/,"=;expires="+(new Date).toUTCString()+";path=/")}),localStorage.clear()}function h(a,b){var c=a.style;c.opacity=0,c.display="block",function d(){(c.opacity-=-.1)>.9?null:setTimeout(d,b/10)}()}function i(a,b){var c=a.style;c.opacity=1,function d(){(c.opacity-=.1)<.1?c.display="none":setTimeout(d,b/10)}()}function j(a){setTimeout(function(){var b=document.getElementById("cookie-bar").clientHeight;switch(a){case"top":document.getElementsByTagName("body")[0].style.marginTop=b+"px";break;case"bottom":document.getElementsByTagName("body")[0].style.marginBottom=b+"px"}},300)}function k(){var a=document.getElementById("cookie-bar").clientHeight;if(l("top")){var b=parseInt(document.getElementsByTagName("body")[0].style.marginTop);document.getElementsByTagName("body")[0].style.marginTop=b-a+"px"}else{var c=parseInt(document.getElementsByTagName("body")[0].style.marginBottom);document.getElementsByTagName("body")[0].style.marginBottom=c-a+"px"}}function l(a){var b=v.split(a+"=");return b[1]?b[1].split(/[&?]+/)[0]:!1}function m(){o.addEventListener("click",function(){f("cookiebar","CookieAllowed"),k(),i(q,250),i(n,250)}),p.addEventListener("click",function(){var a=u.textContent.trim(),b=window.confirm(a);b===!0&&(g(),f("cookiebar","CookieDisallowed"),k(),i(q,250),i(n,250))}),r.addEventListener("click",function(){h(q,250)}),s.addEventListener("click",function(){i(q,250)})}var n,o,p,q,r,s,t,u,v=c();"CookieDisallowed"==e()&&(g(),f("cookiebar","CookieDisallowed"));var w=new XMLHttpRequest;w.open("GET","//freegeoip.net/json/",!0),w.onreadystatechange=function(){if(4===w.readyState&&200===w.status){clearTimeout(x);var a=JSON.parse(w.responseText).country_code;if(cookieLawStates.indexOf(a)>-1){if(l("always")){var c=e();void 0===c&&b()}else if(document.cookie.length>0||window.localStorage.length>0){var c=e();void 0===c&&b()}}else console.log("cookieBAR - Not an EU user, no cookieBAR.")}},w.send();var x=setTimeout(a,1500)}var CookieLanguages=["en","it","fr","hu","de"],cookieLawStates=["BE","BG","CZ","DK","DE","EE","IE","EL","ES","FR","IT","CY","LV","LT","LU","HU","MT","NL","AT","PL","PT","RO","SI","SK","FI","SE","GB"];document.addEventListener("DOMContentLoaded",function(){setupCookieBar()}); \ No newline at end of file