vendor/assets/javascripts/jquery.cookie.js in h2ocube_rails_assets-0.0.24 vs vendor/assets/javascripts/jquery.cookie.js in h2ocube_rails_assets-0.0.25
- old
+ new
@@ -1,7 +1,7 @@
/*!
- * jQuery Cookie Plugin v1.3.1
+ * jQuery Cookie Plugin v1.4.0
* https://github.com/carhartl/jquery-cookie
*
* Copyright 2013 Klaus Hartl
* Released under the MIT license
*/
@@ -15,51 +15,60 @@
}
}(function ($) {
var pluses = /\+/g;
+ function encode(s) {
+ return config.raw ? s : encodeURIComponent(s);
+ }
+
function decode(s) {
- if (config.raw) {
- return s;
- }
- try {
- // If we can't decode the cookie, ignore it, it's unusable.
- return decodeURIComponent(s.replace(pluses, ' '));
- } catch(e) {}
+ return config.raw ? s : decodeURIComponent(s);
}
- function decodeAndParse(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, '\\');
}
- s = decode(s);
+ try {
+ // Replace server-side written pluses with spaces.
+ // If we can't decode the cookie, ignore it, it's unusable.
+ s = decodeURIComponent(s.replace(pluses, ' '));
+ } catch(e) {
+ return;
+ }
try {
// If we can't parse the cookie, ignore it, it's unusable.
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) {
// Write
- if (value !== undefined) {
+ 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.setDate(t.getDate() + days);
}
- value = config.json ? JSON.stringify(value) : String(value);
-
return (document.cookie = [
- config.raw ? key : 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.path ? '; path=' + options.path : '',
options.domain ? '; domain=' + options.domain : '',
options.secure ? '; secure' : ''
].join(''));
@@ -78,15 +87,16 @@
var parts = cookies[i].split('=');
var name = decode(parts.shift());
var cookie = parts.join('=');
if (key && key === name) {
- result = decodeAndParse(cookie);
+ // 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 = decodeAndParse(cookie)) !== undefined) {
+ if (!key && (cookie = read(cookie)) !== undefined) {
result[name] = cookie;
}
}
return result;