diff options
| -rw-r--r-- | templates/web/fixmystreet.com/footer_extra_js.html | 1 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet.com/js.js | 5 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet.com/vendor/jquery.cookie.min.js | 13 |
3 files changed, 3 insertions, 16 deletions
diff --git a/templates/web/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html index d5ed1543d..67f1dbb6a 100644 --- a/templates/web/fixmystreet.com/footer_extra_js.html +++ b/templates/web/fixmystreet.com/footer_extra_js.html @@ -1,5 +1,4 @@ [% scripts.push( version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'), - version('/cobrands/fixmystreet.com/vendor/jquery.cookie.min.js'), version('/cobrands/fixmystreet.com/js.js'), ) %] diff --git a/web/cobrands/fixmystreet.com/js.js b/web/cobrands/fixmystreet.com/js.js index 5aecd820e..b10ac5921 100644 --- a/web/cobrands/fixmystreet.com/js.js +++ b/web/cobrands/fixmystreet.com/js.js @@ -15,11 +15,12 @@ $(function(){ $('.top_banner__close').live('click', function() { $('.top_banner--country').hide(); - $.cookie('has_seen_country_message', 1, {expires: 365, path: '/'}); + var t = new Date(); t.setFullYear(t.getFullYear() + 1); + document.cookie = 'has_seen_country_message=1; path=/; expires=' + t.toUTCString(); }); if ( $('body.frontpage').length && -1 == navigator.userAgent.indexOf('Google Page Speed')) { - if (!$.cookie('has_seen_country_message')) { + if (document.cookie.indexOf('has_seen_country_message') === -1) { $.ajax({ url: 'https://gaze.mysociety.org/gaze-rest?f=get_country_from_ip', success: function(data) { diff --git a/web/cobrands/fixmystreet.com/vendor/jquery.cookie.min.js b/web/cobrands/fixmystreet.com/vendor/jquery.cookie.min.js deleted file mode 100644 index 3fa82b82b..000000000 --- a/web/cobrands/fixmystreet.com/vendor/jquery.cookie.min.js +++ /dev/null @@ -1,13 +0,0 @@ - -(function(factory){if(typeof define==='function'&&define.amd){define(['jquery'],factory);}else if(typeof exports==='object'){factory(require('jquery'));}else{factory(jQuery);}}(function($){var pluses=/\+/g;function encode(s){return config.raw?s:encodeURIComponent(s);} -function decode(s){return config.raw?s:decodeURIComponent(s);} -function stringifyCookieValue(value){return encode(config.json?JSON.stringify(value):String(value));} -function parseCookieValue(s){if(s.indexOf('"')===0){s=s.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,'\\');} -try{s=decodeURIComponent(s.replace(pluses,' '));return config.json?JSON.parse(s):s;}catch(e){}} -function read(s,converter){var value=config.raw?s:parseCookieValue(s);return $.isFunction(converter)?converter(value):value;} -var config=$.cookie=function(key,value,options){if(value!==undefined&&!$.isFunction(value)){options=$.extend({},config.defaults,options);if(typeof options.expires==='number'){var days=options.expires,t=options.expires=new Date();t.setTime(+t+days*864e+5);} -return(document.cookie=[encode(key),'=',stringifyCookieValue(value),options.expires?'; expires='+options.expires.toUTCString():'',options.path?'; path='+options.path:'',options.domain?'; domain='+options.domain:'',options.secure?'; secure':''].join(''));} -var result=key?undefined:{};var cookies=document.cookie?document.cookie.split('; '):[];for(var i=0,l=cookies.length;i<l;i++){var parts=cookies[i].split('=');var name=decode(parts.shift());var cookie=parts.join('=');if(key&&key===name){result=read(cookie,value);break;} -if(!key&&(cookie=read(cookie))!==undefined){result[name]=cookie;}} -return result;};config.defaults={};$.removeCookie=function(key,options){if($.cookie(key)===undefined){return false;} -$.cookie(key,'',$.extend({},options,{expires:-1}));return!$.cookie(key);};}));
\ No newline at end of file |