jQuery cookie plugin updated

Source: https://plugins.jquery.com/cookie/
This commit is contained in:
Mikael Nordfeldth 2015-03-07 01:00:07 +01:00
parent 395c2cc075
commit bc1d667784
1 changed files with 38 additions and 28 deletions

View File

@ -1,5 +1,5 @@
/*! /*!
* jQuery Cookie Plugin v1.3.1 * jQuery Cookie Plugin v1.4.1
* https://github.com/carhartl/jquery-cookie * https://github.com/carhartl/jquery-cookie
* *
* Copyright 2013 Klaus Hartl * Copyright 2013 Klaus Hartl
@ -7,57 +7,65 @@
*/ */
(function (factory) { (function (factory) {
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
// AMD. Register as anonymous module. // AMD
define(['jquery'], factory); define(['jquery'], factory);
} else if (typeof exports === 'object') {
// CommonJS
factory(require('jquery'));
} else { } else {
// Browser globals. // Browser globals
factory(jQuery); factory(jQuery);
} }
}(function ($) { }(function ($) {
var pluses = /\+/g; var pluses = /\+/g;
function decode(s) { function encode(s) {
if (config.raw) { return config.raw ? s : encodeURIComponent(s);
return s;
}
try {
// If we can't decode the cookie, ignore it, it's unusable.
return decodeURIComponent(s.replace(pluses, ' '));
} catch(e) {}
} }
function decodeAndParse(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) { if (s.indexOf('"') === 0) {
// This is a quoted cookie as according to RFC2068, unescape... // This is a quoted cookie as according to RFC2068, unescape...
s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
} }
s = decode(s);
try { try {
// Replace server-side written pluses with spaces.
// If we can't decode the cookie, ignore it, it's unusable.
// If we can't parse the cookie, ignore it, it's unusable. // If we can't parse the cookie, ignore it, it's unusable.
s = decodeURIComponent(s.replace(pluses, ' '));
return config.json ? JSON.parse(s) : s; return config.json ? JSON.parse(s) : s;
} catch(e) {} } 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) { var config = $.cookie = function (key, value, options) {
// Write // Write
if (value !== undefined) {
if (value !== undefined && !$.isFunction(value)) {
options = $.extend({}, config.defaults, options); options = $.extend({}, config.defaults, options);
if (typeof options.expires === 'number') { if (typeof options.expires === 'number') {
var days = options.expires, t = options.expires = new Date(); var days = options.expires, t = options.expires = new Date();
t.setDate(t.getDate() + days); t.setTime(+t + days * 864e+5);
} }
value = config.json ? JSON.stringify(value) : String(value);
return (document.cookie = [ return (document.cookie = [
config.raw ? key : encodeURIComponent(key), encode(key), '=', stringifyCookieValue(value),
'=',
config.raw ? value : encodeURIComponent(value),
options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
options.path ? '; path=' + options.path : '', options.path ? '; path=' + options.path : '',
options.domain ? '; domain=' + options.domain : '', options.domain ? '; domain=' + options.domain : '',
@ -80,12 +88,13 @@
var cookie = parts.join('='); var cookie = parts.join('=');
if (key && key === name) { if (key && key === name) {
result = decodeAndParse(cookie); // If second argument (value) is a function it's a converter...
result = read(cookie, value);
break; break;
} }
// Prevent storing a cookie that we couldn't decode. // Prevent storing a cookie that we couldn't decode.
if (!key && (cookie = decodeAndParse(cookie)) !== undefined) { if (!key && (cookie = read(cookie)) !== undefined) {
result[name] = cookie; result[name] = cookie;
} }
} }
@ -96,12 +105,13 @@
config.defaults = {}; config.defaults = {};
$.removeCookie = function (key, options) { $.removeCookie = function (key, options) {
if ($.cookie(key) !== undefined) { if ($.cookie(key) === undefined) {
// Must not alter options, thus extending a fresh object... return false;
$.cookie(key, '', $.extend({}, options, { expires: -1 }));
return true;
} }
return false;
// Must not alter options, thus extending a fresh object...
$.cookie(key, '', $.extend({}, options, { expires: -1 }));
return !$.cookie(key);
}; };
})); }));