From 5ec8e1ed10046ed21eef593b4e7629f1ff06ce37 Mon Sep 17 00:00:00 2001 From: paladox Date: Thu, 12 Jun 2014 12:45:54 -0700 Subject: [PATCH] Update jQuery Cookie to v1.2.0 Source * https://github.com/carhartl/jquery-cookie/blob/v1.2.0/jquery.cookie.js Change log * https://github.com/carhartl/jquery-cookie/blob/v1.2.0/CHANGELOG.md README * https://github.com/carhartl/jquery-cookie/blob/v1.2.0/README.md We're upgrading from an early alpha version of v1.1 (faa09dc). The main change is the addition of $.removeCookie() for deleting cookies, usage of $.cookie('key', null) has been deprecated. We should eventually upgrade to v1.4.1, but that has a breaking change. Namely, it drops support for $.cookie('key', null) which needs to be replaced by $.removeCookie which didn't exist until v1.2.0. Change-Id: I511138518fcd8bffc86fc3feaf5dbe253c7d786f --- RELEASE-NOTES-1.24 | 1 + resources/lib/jquery/jquery.cookie.js | 103 ++++++++++++++++---------- 2 files changed, 65 insertions(+), 39 deletions(-) diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index 82ec1dc1ed..368654808c 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -114,6 +114,7 @@ production. * (bug 67042) Added support for the HTML5 tag for East Asian typography. * Upgrade Sinon.JS to 1.10.3. * Added the es5-shim polyfill for older or non-compliant javascript engines. +* Upgrade jQuery Cookie to v1.2.0. === Bug fixes in 1.24 === * (bug 49116) Footer copyright notice is now always displayed in user language diff --git a/resources/lib/jquery/jquery.cookie.js b/resources/lib/jquery/jquery.cookie.js index 6d5974a2c5..95001fb0d4 100644 --- a/resources/lib/jquery/jquery.cookie.js +++ b/resources/lib/jquery/jquery.cookie.js @@ -1,5 +1,6 @@ +/*jshint eqnull:true */ /*! - * jQuery Cookie Plugin + * jQuery Cookie Plugin v1.2 * https://github.com/carhartl/jquery-cookie * * Copyright 2011, Klaus Hartl @@ -7,41 +8,65 @@ * http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/GPL-2.0 */ -(function($) { - $.cookie = function(key, value, options) { - - // key and at least value given, set cookie... - if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) { - options = $.extend({}, options); - - if (value === null || value === undefined) { - options.expires = -1; - } - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - value = String(value); - - return (document.cookie = [ - encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(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('')); - } - - // key and possibly options given, get cookie... - options = value || {}; - var decode = options.raw ? function(s) { return s; } : decodeURIComponent; - - var pairs = document.cookie.split('; '); - for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) { - if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined - } - return null; - }; -})(jQuery); +(function ($, document, undefined) { + + var pluses = /\+/g; + + function raw(s) { + return s; + } + + function decoded(s) { + return decodeURIComponent(s.replace(pluses, ' ')); + } + + $.cookie = function (key, value, options) { + + // key and at least value given, set cookie... + if (value !== undefined && !/Object/.test(Object.prototype.toString.call(value))) { + options = $.extend({}, $.cookie.defaults, options); + + if (value === null) { + options.expires = -1; + } + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setDate(t.getDate() + days); + } + + value = String(value); + + return (document.cookie = [ + encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(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('')); + } + + // key and possibly options given, get cookie... + options = value || $.cookie.defaults || {}; + var decode = options.raw ? raw : decoded; + var cookies = document.cookie.split('; '); + for (var i = 0, parts; (parts = cookies[i] && cookies[i].split('=')); i++) { + if (decode(parts.shift()) === key) { + return decode(parts.join('=')); + } + } + + return null; + }; + + $.cookie.defaults = {}; + + $.removeCookie = function (key, options) { + if ($.cookie(key, options) !== null) { + $.cookie(key, null, options); + return true; + } + return false; + }; + +})(jQuery, document); -- 2.20.1