Update jquery.cookie

This commit is contained in:
Tom Hughes 2013-12-11 00:12:39 +00:00
parent 9cc9a00988
commit 54608122bb
2 changed files with 77 additions and 34 deletions

View file

@ -1,5 +1,6 @@
folder 'vendor/assets' do folder 'vendor/assets' do
folder 'jquery' do folder 'jquery' do
file 'jquery.cookie.js', 'https://raw.github.com/carhartl/jquery-cookie/master/jquery.cookie.js'
file 'jquery.throttle-debounce.js', 'https://raw.github.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js' file 'jquery.throttle-debounce.js', 'https://raw.github.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
file 'jquery.simulate.js', 'https://raw.github.com/jquery/jquery-ui/master/tests/jquery.simulate.js' file 'jquery.simulate.js', 'https://raw.github.com/jquery/jquery-ui/master/tests/jquery.simulate.js'
end end

View file

@ -1,44 +1,68 @@
/*jshint eqnull:true */
/*! /*!
* jQuery Cookie Plugin v1.2 * jQuery Cookie Plugin v1.4.0
* https://github.com/carhartl/jquery-cookie * https://github.com/carhartl/jquery-cookie
* *
* Copyright 2011, Klaus Hartl * Copyright 2013 Klaus Hartl
* Dual licensed under the MIT or GPL Version 2 licenses. * Released under the MIT license
* http://www.opensource.org/licenses/mit-license.php
* http://www.opensource.org/licenses/GPL-2.0
*/ */
(function ($, document, undefined) { (function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as anonymous module.
define(['jquery'], factory);
} else {
// Browser globals.
factory(jQuery);
}
}(function ($) {
var pluses = /\+/g; var pluses = /\+/g;
function raw(s) { function encode(s) {
return s; return config.raw ? s : encodeURIComponent(s);
} }
function decoded(s) { function decode(s) {
return decodeURIComponent(s.replace(pluses, ' ')); 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) {
// This is a quoted cookie as according to RFC2068, unescape...
s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
}
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.
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) { var config = $.cookie = function (key, value, options) {
// write // Write
if (value !== undefined) {
options = $.extend({}, config.defaults, options);
if (value === null) { if (value !== undefined && !$.isFunction(value)) {
options.expires = -1; 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 = [
encodeURIComponent(key), '=', config.raw ? value : encodeURIComponent(value), encode(key), '=', stringifyCookieValue(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 : '',
@ -46,27 +70,45 @@
].join('')); ].join(''));
} }
// read // Read
var decode = config.raw ? raw : decoded;
var cookies = document.cookie.split('; '); var result = key ? undefined : {};
for (var i = 0, parts; (parts = cookies[i] && cookies[i].split('=')); i++) {
if (decode(parts.shift()) === key) { // To prevent the for loop in the first place assign an empty array
var cookie = decode(parts.join('=')); // in case there are no cookies at all. Also prevents odd result when
return config.json ? JSON.parse(cookie) : cookie; // calling $.cookie().
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) {
// If second argument (value) is a function it's a converter...
result = read(cookie, value);
break;
}
// Prevent storing a cookie that we couldn't decode.
if (!key && (cookie = read(cookie)) !== undefined) {
result[name] = cookie;
} }
} }
return null; return result;
}; };
config.defaults = {}; config.defaults = {};
$.removeCookie = function (key, options) { $.removeCookie = function (key, options) {
if ($.cookie(key) !== null) { if ($.cookie(key) === undefined) {
$.cookie(key, null, options);
return true;
}
return false; return false;
}
// Must not alter options, thus extending a fresh object...
$.cookie(key, '', $.extend({}, options, { expires: -1 }));
return !$.cookie(key);
}; };
})(jQuery, document); }));