From e1964bdf677a70a51d0bb8bd5723cd7c549d53c4 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 23 Dec 2013 12:50:11 +0100 Subject: [PATCH] Bug 10858: Update the jquery.json plugin to the lastest version --- .../prog/en/lib/jquery/plugins/jquery.json.js | 312 ++++++++++---------- 1 file changed, 156 insertions(+), 156 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.json.js b/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.json.js index d01e310..ece0d41 100644 --- a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.json.js +++ b/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.json.js @@ -1,5 +1,5 @@ /** - * jQuery JSON plugin 2.4-alpha + * jQuery JSON plugin 2.4.0 * * @author Brantley Harris, 2009-2011 * @author Timo Tijhof, 2011-2012 @@ -12,188 +12,188 @@ * @license MIT License */ (function ($) { - 'use strict'; + 'use strict'; - var escape = /["\\\x00-\x1f\x7f-\x9f]/g, - meta = { - '\b': '\\b', - '\t': '\\t', - '\n': '\\n', - '\f': '\\f', - '\r': '\\r', - '"' : '\\"', - '\\': '\\\\' - }, - hasOwn = Object.prototype.hasOwnProperty; + var escape = /["\\\x00-\x1f\x7f-\x9f]/g, + meta = { + '\b': '\\b', + '\t': '\\t', + '\n': '\\n', + '\f': '\\f', + '\r': '\\r', + '"' : '\\"', + '\\': '\\\\' + }, + hasOwn = Object.prototype.hasOwnProperty; - /** + /** * jQuery.toJSON - * Converts the given argument into a JSON representation. - * - * @param o {Mixed} The json-serializable *thing* to be converted - * - * If an object has a toJSON prototype, that will be used to get the representation. - * Non-integer/string keys are skipped in the object, as are keys that point to a - * function. - * - */ + * Converts the given argument into a JSON representation. + * + * @param o {Mixed} The json-serializable *thing* to be converted + * + * If an object has a toJSON prototype, that will be used to get the representation. + * Non-integer/string keys are skipped in the object, as are keys that point to a + * function. + * + */ $.toJSON = typeof JSON === 'object' && JSON.stringify ? JSON.stringify : function (o) { - if (o === null) { - return 'null'; - } + if (o === null) { + return 'null'; + } - var pairs, k, name, val, - type = $.type(o); + var pairs, k, name, val, + type = $.type(o); - if (type === 'undefined') { - return undefined; - } + if (type === 'undefined') { + return undefined; + } - // Also covers instantiated Number and Boolean objects, - // which are typeof 'object' but thanks to $.type, we - // catch them here. I don't know whether it is right - // or wrong that instantiated primitives are not - // exported to JSON as an {"object":..}. - // We choose this path because that's what the browsers did. - if (type === 'number' || type === 'boolean') { - return String(o); - } - if (type === 'string') { - return $.quoteString(o); - } - if (typeof o.toJSON === 'function') { - return $.toJSON(o.toJSON()); - } - if (type === 'date') { - var month = o.getUTCMonth() + 1, - day = o.getUTCDate(), - year = o.getUTCFullYear(), - hours = o.getUTCHours(), - minutes = o.getUTCMinutes(), - seconds = o.getUTCSeconds(), - milli = o.getUTCMilliseconds(); + // Also covers instantiated Number and Boolean objects, + // which are typeof 'object' but thanks to $.type, we + // catch them here. I don't know whether it is right + // or wrong that instantiated primitives are not + // exported to JSON as an {"object":..}. + // We choose this path because that's what the browsers did. + if (type === 'number' || type === 'boolean') { + return String(o); + } + if (type === 'string') { + return $.quoteString(o); + } + if (typeof o.toJSON === 'function') { + return $.toJSON(o.toJSON()); + } + if (type === 'date') { + var month = o.getUTCMonth() + 1, + day = o.getUTCDate(), + year = o.getUTCFullYear(), + hours = o.getUTCHours(), + minutes = o.getUTCMinutes(), + seconds = o.getUTCSeconds(), + milli = o.getUTCMilliseconds(); - if (month < 10) { - month = '0' + month; - } - if (day < 10) { - day = '0' + day; - } - if (hours < 10) { - hours = '0' + hours; - } - if (minutes < 10) { - minutes = '0' + minutes; - } - if (seconds < 10) { - seconds = '0' + seconds; - } - if (milli < 100) { - milli = '0' + milli; - } - if (milli < 10) { - milli = '0' + milli; - } - return '"' + year + '-' + month + '-' + day + 'T' + - hours + ':' + minutes + ':' + seconds + - '.' + milli + 'Z"'; + if (month < 10) { + month = '0' + month; + } + if (day < 10) { + day = '0' + day; + } + if (hours < 10) { + hours = '0' + hours; + } + if (minutes < 10) { + minutes = '0' + minutes; + } + if (seconds < 10) { + seconds = '0' + seconds; } + if (milli < 100) { + milli = '0' + milli; + } + if (milli < 10) { + milli = '0' + milli; + } + return '"' + year + '-' + month + '-' + day + 'T' + + hours + ':' + minutes + ':' + seconds + + '.' + milli + 'Z"'; + } - pairs = []; + pairs = []; - if ($.isArray(o)) { - for (k = 0; k < o.length; k++) { - pairs.push($.toJSON(o[k]) || 'null'); - } - return '[' + pairs.join(',') + ']'; + if ($.isArray(o)) { + for (k = 0; k < o.length; k++) { + pairs.push($.toJSON(o[k]) || 'null'); } + return '[' + pairs.join(',') + ']'; + } - // Any other object (plain object, RegExp, ..) - // Need to do typeof instead of $.type, because we also - // want to catch non-plain objects. - if (typeof o === 'object') { - for (k in o) { - // Only include own properties, - // Filter out inherited prototypes - if (hasOwn.call(o, k)) { - // Keys must be numerical or string. Skip others - type = typeof k; - if (type === 'number') { - name = '"' + k + '"'; - } else if (type === 'string') { - name = $.quoteString(k); - } else { - continue; - } - type = typeof o[k]; + // Any other object (plain object, RegExp, ..) + // Need to do typeof instead of $.type, because we also + // want to catch non-plain objects. + if (typeof o === 'object') { + for (k in o) { + // Only include own properties, + // Filter out inherited prototypes + if (hasOwn.call(o, k)) { + // Keys must be numerical or string. Skip others + type = typeof k; + if (type === 'number') { + name = '"' + k + '"'; + } else if (type === 'string') { + name = $.quoteString(k); + } else { + continue; + } + type = typeof o[k]; - // Invalid values like these return undefined - // from toJSON, however those object members - // shouldn't be included in the JSON string at all. - if (type !== 'function' && type !== 'undefined') { - val = $.toJSON(o[k]); - pairs.push(name + ':' + val); - } - } - } - return '{' + pairs.join(',') + '}'; + // Invalid values like these return undefined + // from toJSON, however those object members + // shouldn't be included in the JSON string at all. + if (type !== 'function' && type !== 'undefined') { + val = $.toJSON(o[k]); + pairs.push(name + ':' + val); + } + } } - }; + return '{' + pairs.join(',') + '}'; + } + }; /** * jQuery.evalJSON - * Evaluates a given json string. - * - * @param str {String} - */ + * Evaluates a given json string. + * + * @param str {String} + */ $.evalJSON = typeof JSON === 'object' && JSON.parse ? JSON.parse : function (str) { - /*jshint evil: true */ - return eval('(' + str + ')'); - }; + /*jshint evil: true */ + return eval('(' + str + ')'); + }; /** * jQuery.secureEvalJSON - * Evals JSON in a way that is *more* secure. - * - * @param str {String} - */ + * Evals JSON in a way that is *more* secure. + * + * @param str {String} + */ $.secureEvalJSON = typeof JSON === 'object' && JSON.parse ? JSON.parse : function (str) { - var filtered = - str - .replace(/\\["\\\/bfnrtu]/g, '@') - .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']') - .replace(/(?:^|:|,)(?:\s*\[)+/g, ''); + var filtered = + str + .replace(/\\["\\\/bfnrtu]/g, '@') + .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']') + .replace(/(?:^|:|,)(?:\s*\[)+/g, ''); - if (/^[\],:{}\s]*$/.test(filtered)) { - /*jshint evil: true */ - return eval('(' + str + ')'); - } - throw new SyntaxError('Error parsing JSON, source is not valid.'); - }; + if (/^[\],:{}\s]*$/.test(filtered)) { + /*jshint evil: true */ + return eval('(' + str + ')'); + } + throw new SyntaxError('Error parsing JSON, source is not valid.'); + }; /** * jQuery.quoteString - * Returns a string-repr of a string, escaping quotes intelligently. - * Mostly a support function for toJSON. - * Examples: - * >>> jQuery.quoteString('apple') - * "apple" - * - * >>> jQuery.quoteString('"Where are we going?", she asked.') - * "\"Where are we going?\", she asked." - */ + * Returns a string-repr of a string, escaping quotes intelligently. + * Mostly a support function for toJSON. + * Examples: + * >>> jQuery.quoteString('apple') + * "apple" + * + * >>> jQuery.quoteString('"Where are we going?", she asked.') + * "\"Where are we going?\", she asked." + */ $.quoteString = function (str) { - if (str.match(escape)) { - return '"' + str.replace(escape, function (a) { - var c = meta[a]; - if (typeof c === 'string') { - return c; - } - c = a.charCodeAt(); - return '\\u00' + Math.floor(c / 16).toString(16) + (c % 16).toString(16); - }) + '"'; - } - return '"' + str + '"'; - }; + if (str.match(escape)) { + return '"' + str.replace(escape, function (a) { + var c = meta[a]; + if (typeof c === 'string') { + return c; + } + c = a.charCodeAt(); + return '\\u00' + Math.floor(c / 16).toString(16) + (c % 16).toString(16); + }) + '"'; + } + return '"' + str + '"'; + }; }(jQuery)); -- 1.7.10.4