diff options
-rw-r--r-- | external/jquery.cookie-r6165.js | 97 | ||||
-rw-r--r-- | external/jquery.cookie.js | 89 | ||||
-rw-r--r-- | tests/unit/all.html | 2 | ||||
-rw-r--r-- | tests/unit/all_2.html | 2 | ||||
-rw-r--r-- | tests/unit/defaults.html | 2 | ||||
-rw-r--r-- | tests/unit/index.html | 2 | ||||
-rw-r--r-- | tests/unit/tabs/tabs.html | 2 |
7 files changed, 94 insertions, 102 deletions
diff --git a/external/jquery.cookie-r6165.js b/external/jquery.cookie-r6165.js deleted file mode 100644 index a80bfa29d..000000000 --- a/external/jquery.cookie-r6165.js +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Cookie plugin - * - * Copyright (c) 2006 Klaus Hartl (stilbuero.de) - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - */ - -/** - * Create a cookie with the given name and value and other optional parameters. - * - * @example $.cookie('the_cookie', 'the_value'); - * @desc Set the value of a cookie. - * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true }); - * @desc Create a cookie with all available options. - * @example $.cookie('the_cookie', 'the_value'); - * @desc Create a session cookie. - * @example $.cookie('the_cookie', null); - * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain - * used when the cookie was set. - * - * @param String name The name of the cookie. - * @param String value The value of the cookie. - * @param Object options An object literal containing key/value pairs to provide optional cookie attributes. - * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object. - * If a negative value is specified (e.g. a date in the past), the cookie will be deleted. - * If set to null or omitted, the cookie will be a session cookie and will not be retained - * when the the browser exits. - * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie). - * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie). - * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will - * require a secure protocol (like HTTPS). - * @type undefined - * - * @name $.cookie - * @cat Plugins/Cookie - * @author Klaus Hartl/klaus.hartl@stilbuero.de - */ - -/** - * Get the value of a cookie with the given name. - * - * @example $.cookie('the_cookie'); - * @desc Get the value of a cookie. - * - * @param String name The name of the cookie. - * @return The value of the cookie. - * @type String - * - * @name $.cookie - * @cat Plugins/Cookie - * @author Klaus Hartl/klaus.hartl@stilbuero.de - */ -jQuery.cookie = function(name, value, options) { - if (typeof value != 'undefined') { // name and value given, set cookie - options = options || {}; - if (value === null) { - value = ''; - options = $.extend({}, options); // clone object since it's unexpected behavior if the expired property were changed - options.expires = -1; - } - var expires = ''; - if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) { - var date; - if (typeof options.expires == 'number') { - date = new Date(); - date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); - } else { - date = options.expires; - } - expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE - } - // NOTE Needed to parenthesize options.path and options.domain - // in the following expressions, otherwise they evaluate to undefined - // in the packed version for some reason... - var path = options.path ? '; path=' + (options.path) : ''; - var domain = options.domain ? '; domain=' + (options.domain) : ''; - var secure = options.secure ? '; secure' : ''; - document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join(''); - } else { // only name given, get cookie - var cookieValue = null; - if (document.cookie && document.cookie != '') { - var cookies = document.cookie.split(';'); - for (var i = 0; i < cookies.length; i++) { - var cookie = jQuery.trim(cookies[i]); - // Does this cookie string begin with the name we want? - if (cookie.substring(0, name.length + 1) == (name + '=')) { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } - } - } - return cookieValue; - } -};
\ No newline at end of file diff --git a/external/jquery.cookie.js b/external/jquery.cookie.js new file mode 100644 index 000000000..7b3e70125 --- /dev/null +++ b/external/jquery.cookie.js @@ -0,0 +1,89 @@ +/*jslint browser: true */ /*global jQuery: true */ + +/** + * jQuery Cookie plugin + * + * Copyright (c) 2010 Klaus Hartl (stilbuero.de) + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + */ + +// TODO JsDoc + +/** + * Create a cookie with the given key and value and other optional parameters. + * + * @example $.cookie('the_cookie', 'the_value'); + * @desc Set the value of a cookie. + * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true }); + * @desc Create a cookie with all available options. + * @example $.cookie('the_cookie', 'the_value'); + * @desc Create a session cookie. + * @example $.cookie('the_cookie', null); + * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain + * used when the cookie was set. + * + * @param String key The key of the cookie. + * @param String value The value of the cookie. + * @param Object options An object literal containing key/value pairs to provide optional cookie attributes. + * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object. + * If a negative value is specified (e.g. a date in the past), the cookie will be deleted. + * If set to null or omitted, the cookie will be a session cookie and will not be retained + * when the the browser exits. + * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie). + * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie). + * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will + * require a secure protocol (like HTTPS). + * @type undefined + * + * @name $.cookie + * @cat Plugins/Cookie + * @author Klaus Hartl/klaus.hartl@stilbuero.de + */ + +/** + * Get the value of a cookie with the given key. + * + * @example $.cookie('the_cookie'); + * @desc Get the value of a cookie. + * + * @param String key The key of the cookie. + * @return The value of the cookie. + * @type String + * + * @name $.cookie + * @cat Plugins/Cookie + * @author Klaus Hartl/klaus.hartl@stilbuero.de + */ +jQuery.cookie = function (key, value, options) { + + // key and value given, set cookie... + if (arguments.length > 1 && (value === null || typeof value !== "object")) { + options = jQuery.extend({}, 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); + } + + return (document.cookie = [ + encodeURIComponent(key), '=', + options.raw ? String(value) : encodeURIComponent(String(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 result, decode = options.raw ? function (s) { return s; } : decodeURIComponent; + return (result = new RegExp('(?:^|; )' + encodeURIComponent(key) + '=([^;]*)').exec(document.cookie)) ? decode(result[1]) : null; +}; diff --git a/tests/unit/all.html b/tests/unit/all.html index fe6708953..533276a78 100644 --- a/tests/unit/all.html +++ b/tests/unit/all.html @@ -21,7 +21,7 @@ <script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script> <script type="text/javascript" src="../../external/testrunner-r6588.js"></script> - <script type="text/javascript" src="../../external/jquery.cookie-r6165.js"></script> + <script type="text/javascript" src="../../external/jquery.cookie.js"></script> <script type="text/javascript" src="../jquery.simulate.js"></script> <script type="text/javascript" src="testsuite.js"></script> diff --git a/tests/unit/all_2.html b/tests/unit/all_2.html index 2cfbc7185..9ae43029e 100644 --- a/tests/unit/all_2.html +++ b/tests/unit/all_2.html @@ -54,7 +54,7 @@ <script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script> <script type="text/javascript" src="../../external/testrunner-r6588.js"></script> - <script type="text/javascript" src="../../external/jquery.cookie-r6165.js"></script> + <script type="text/javascript" src="../../external/jquery.cookie.js"></script> <script type="text/javascript" src="../jquery.simulate.js"></script> <style type="text/css"> diff --git a/tests/unit/defaults.html b/tests/unit/defaults.html index d76f8d2b1..99b2aa797 100644 --- a/tests/unit/defaults.html +++ b/tests/unit/defaults.html @@ -21,7 +21,7 @@ <link type="text/css" href="testsuite.css" rel="stylesheet" /> <script type="text/javascript" src="testsuite.js"></script> <script type="text/javascript" src="../../external/testrunner-r6588.js"></script> - <script type="text/javascript" src="../../external/jquery.cookie-r6165.js"></script> + <script type="text/javascript" src="../../external/jquery.cookie.js"></script> <script type="text/javascript" src="../jquery.simulate.js"></script> <script type="text/javascript" src="draggable/draggable_defaults.js"></script> diff --git a/tests/unit/index.html b/tests/unit/index.html index d79c01cc6..11f478bf7 100644 --- a/tests/unit/index.html +++ b/tests/unit/index.html @@ -24,7 +24,7 @@ <script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script> - <script type="text/javascript" src="../../external/jquery.cookie-r6165.js"></script> + <script type="text/javascript" src="../../external/jquery.cookie.js"></script> <script type="text/javascript" src="../jquery.simulate.js"></script> </head> diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html index 9c87de481..adb22cf72 100644 --- a/tests/unit/tabs/tabs.html +++ b/tests/unit/tabs/tabs.html @@ -10,7 +10,7 @@ <link type="text/css" href="../testsuite.css" rel="stylesheet" /> <script type="text/javascript" src="../../../external/testrunner-r6588.js"></script> - <script type="text/javascript" src="../../../external/jquery.cookie-r6165.js"></script> + <script type="text/javascript" src="../../../external/jquery.cookie.js"></script> <script type="text/javascript" src="../../jquery.simulate.js"></script> <script type="text/javascript" src="../testsuite.js"></script> |