Update jquery.cookie

diff --git a/Vendorfile b/Vendorfile
index f4cdd33cf9612eab01222e6533d26e4439143e51..483e46aa16a42104158b575cebae1f709fdfb430 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,5 +1,6 @@
 folder 'vendor/assets' do
   folder 'jquery' do
 folder 'vendor/assets' 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.simulate.js', 'https://raw.github.com/jquery/jquery-ui/master/tests/jquery.simulate.js'
   end
     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'
   end

diff --git a/vendor/assets/jquery/jquery.cookie.js b/vendor/assets/jquery/jquery.cookie.js
index 9e911a605cbd9387eadda29527f4c5f1f3b28b2d..64128472e325825c9c4cd03908be9aaff067ec27 100644 (file)
--- a/vendor/assets/jquery/jquery.cookie.js
+++ b/vendor/assets/jquery/jquery.cookie.js
@@ -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
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
+ * Copyright 2013 Klaus Hartl
+ * Released under the MIT license

  */
  */

-(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) {
-               return s;
+       function encode(s) {
+               return config.raw ? s : encodeURIComponent(s);
+       }
+
+       function decode(s) {
+               return config.raw ? s : decodeURIComponent(s);
+       }
+
+       function stringifyCookieValue(value) {
+               return encode(config.json ? JSON.stringify(value) : String(value));

        }
 
        }
 

-       function decoded(s) {
-               return decodeURIComponent(s.replace(pluses, ' '));
+       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
-               if (value !== undefined) {
-                       options = $.extend({}, config.defaults, options);
+               // Write

 
 

-                       if (value === null) {
-                               options.expires = -1;
-                       }
+               if (value !== undefined && !$.isFunction(value)) {
+                       options = $.extend({}, config.defaults, options);

 
                        if (typeof options.expires === 'number') {
                                var days = options.expires, t = options.expires = new Date();
 
                        if (typeof options.expires === 'number') {
                                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.path    ? '; path=' + options.path : '',
                                options.domain  ? '; domain=' + options.domain : '',
                                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 : '',


@@ -46,27 +70,45 @@
                        ].join(''));
                }
 
                        ].join(''));
                }
 

-               // read
-               var decode = config.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) {
-                               var cookie = decode(parts.join('='));
-                               return config.json ? JSON.parse(cookie) : cookie;
+               // Read
+
+               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().
+               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 = {};
 
        $.removeCookie = function (key, options) {
        };
 
        config.defaults = {};
 
        $.removeCookie = function (key, options) {

-               if ($.cookie(key) !== null) {
-                       $.cookie(key, null, options);
-                       return true;
+               if ($.cookie(key) === undefined) {
+                       return false;

                }
                }

-               return false;
+
+               // Must not alter options, thus extending a fresh object...
+               $.cookie(key, '', $.extend({}, options, { expires: -1 }));
+               return !$.cookie(key);

        };
 
        };
 

-})(jQuery, document);
+}));