From: Tom Hughes Date: Thu, 13 Aug 2015 16:00:44 +0000 (+0100) Subject: Update jquery.cookie X-Git-Tag: live~4066 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bd1a466f2140b235438d49a5f4f245d3d1ec0cc8 Update jquery.cookie --- diff --git a/vendor/assets/jquery/jquery.cookie.js b/vendor/assets/jquery/jquery.cookie.js index feb62e925..8218817b9 100644 --- a/vendor/assets/jquery/jquery.cookie.js +++ b/vendor/assets/jquery/jquery.cookie.js @@ -7,11 +7,11 @@ */ (function (factory) { if (typeof define === 'function' && define.amd) { - // AMD + // AMD (Register as an anonymous module) define(['jquery'], factory); } else if (typeof exports === 'object') { - // CommonJS - factory(require('jquery')); + // Node/CommonJS + module.exports = factory(require('jquery')); } else { // Browser globals factory(jQuery); @@ -61,7 +61,7 @@ if (typeof options.expires === 'number') { var days = options.expires, t = options.expires = new Date(); - t.setTime(+t + days * 864e+5); + t.setMilliseconds(t.getMilliseconds() + days * 864e+5); } return (document.cookie = [ @@ -75,19 +75,20 @@ // Read - var result = key ? undefined : {}; + var result = key ? undefined : {}, + // To prevent the for loop in the first place assign an empty array + // in case there are no cookies at all. Also prevents odd result when + // calling $.cookie(). + cookies = document.cookie ? document.cookie.split('; ') : [], + i = 0, + l = cookies.length; - // To prevent the for loop in the first place assign an empty array - // in case there are no cookies at all. Also prevents odd result when - // calling $.cookie(). - var cookies = document.cookie ? document.cookie.split('; ') : []; + for (; i < l; i++) { + var parts = cookies[i].split('='), + name = decode(parts.shift()), + cookie = parts.join('='); - 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) { + if (key === name) { // If second argument (value) is a function it's a converter... result = read(cookie, value); break; @@ -105,10 +106,6 @@ config.defaults = {}; $.removeCookie = function (key, options) { - if ($.cookie(key) === undefined) { - return false; - } - // Must not alter options, thus extending a fresh object... $.cookie(key, '', $.extend({}, options, { expires: -1 })); return !$.cookie(key);