summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/modules/moz.build2
-rw-r--r--toolkit/modules/third_party/jsesc/README10
-rw-r--r--toolkit/modules/third_party/jsesc/fx-header26
-rw-r--r--toolkit/modules/third_party/jsesc/jsesc.js299
4 files changed, 1 insertions, 336 deletions
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index f9dca9204..4e4c1d5e3 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -81,7 +81,7 @@ EXTRA_JS_MODULES += [
'webrequest/WebRequestUpload.jsm',
'ZipUtils.jsm',
]
-EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']
+
EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
EXTRA_PP_JS_MODULES += [
diff --git a/toolkit/modules/third_party/jsesc/README b/toolkit/modules/third_party/jsesc/README
deleted file mode 100644
index 6665923c4..000000000
--- a/toolkit/modules/third_party/jsesc/README
+++ /dev/null
@@ -1,10 +0,0 @@
-This code comes from an externally managed library, available at
-<https://github.com/mathiasbynens/jsesc>. Bugs should be reported directly
-upstream and integrated back here.
-
-In order to regenerate this file, you need to do the following:
-
- $ git clone git@github.com:mathiasbynens/jsesc.git && cd jsesc
- $ grunt template
- $ export MOZ_JSESC="../mozilla-central/toolkit/modules/third_party/jsesc"
- $ cat $MOZ_JSESC/fx-header jsesc.js > $MOZ_JSESC/jsesc.js
diff --git a/toolkit/modules/third_party/jsesc/fx-header b/toolkit/modules/third_party/jsesc/fx-header
deleted file mode 100644
index fbac20f1c..000000000
--- a/toolkit/modules/third_party/jsesc/fx-header
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-DO NOT TOUCH THIS FILE DIRECTLY. See the README for instructions.
-
-Copyright Mathias Bynens <https://mathiasbynens.be/>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-this.EXPORTED_SYMBOLS = ["jsesc"];
diff --git a/toolkit/modules/third_party/jsesc/jsesc.js b/toolkit/modules/third_party/jsesc/jsesc.js
deleted file mode 100644
index 0145101d5..000000000
--- a/toolkit/modules/third_party/jsesc/jsesc.js
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
-DO NOT TOUCH THIS FILE DIRECTLY. See the README for instructions.
-
-Copyright Mathias Bynens <https://mathiasbynens.be/>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-this.EXPORTED_SYMBOLS = ["jsesc"];
-/*! https://mths.be/jsesc v1.0.0 by @mathias */
-;(function(root) {
-
- // Detect free variables `exports`
- var freeExports = typeof exports == 'object' && exports;
-
- // Detect free variable `module`
- var freeModule = typeof module == 'object' && module &&
- module.exports == freeExports && module;
-
- // Detect free variable `global`, from Node.js or Browserified code,
- // and use it as `root`
- var freeGlobal = typeof global == 'object' && global;
- if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
- root = freeGlobal;
- }
-
- /*--------------------------------------------------------------------------*/
-
- var object = {};
- var hasOwnProperty = object.hasOwnProperty;
- var forOwn = function(object, callback) {
- var key;
- for (key in object) {
- if (hasOwnProperty.call(object, key)) {
- callback(key, object[key]);
- }
- }
- };
-
- var extend = function(destination, source) {
- if (!source) {
- return destination;
- }
- forOwn(source, function(key, value) {
- destination[key] = value;
- });
- return destination;
- };
-
- var forEach = function(array, callback) {
- var length = array.length;
- var index = -1;
- while (++index < length) {
- callback(array[index]);
- }
- };
-
- var toString = object.toString;
- var isArray = function(value) {
- return toString.call(value) == '[object Array]';
- };
- var isObject = function(value) {
- // This is a very simple check, but it’s good enough for what we need.
- return toString.call(value) == '[object Object]';
- };
- var isString = function(value) {
- return typeof value == 'string' ||
- toString.call(value) == '[object String]';
- };
- var isFunction = function(value) {
- // In a perfect world, the `typeof` check would be sufficient. However,
- // in Chrome 1–12, `typeof /x/ == 'object'`, and in IE 6–8
- // `typeof alert == 'object'` and similar for other host objects.
- return typeof value == 'function' ||
- toString.call(value) == '[object Function]';
- };
-
- /*--------------------------------------------------------------------------*/
-
- // https://mathiasbynens.be/notes/javascript-escapes#single
- var singleEscapes = {
- '"': '\\"',
- '\'': '\\\'',
- '\\': '\\\\',
- '\b': '\\b',
- '\f': '\\f',
- '\n': '\\n',
- '\r': '\\r',
- '\t': '\\t'
- // `\v` is omitted intentionally, because in IE < 9, '\v' == 'v'.
- // '\v': '\\x0B'
- };
- var regexSingleEscape = /["'\\\b\f\n\r\t]/;
-
- var regexDigit = /[0-9]/;
- var regexWhitelist = /[ !#-&\(-\[\]-~]/;
-
- var jsesc = function(argument, options) {
- // Handle options
- var defaults = {
- 'escapeEverything': false,
- 'quotes': 'single',
- 'wrap': false,
- 'es6': false,
- 'json': false,
- 'compact': true,
- 'lowercaseHex': false,
- 'indent': '\t',
- '__indent__': ''
- };
- var json = options && options.json;
- if (json) {
- defaults.quotes = 'double';
- defaults.wrap = true;
- }
- options = extend(defaults, options);
- if (options.quotes != 'single' && options.quotes != 'double') {
- options.quotes = 'single';
- }
- var quote = options.quotes == 'double' ? '"' : '\'';
- var compact = options.compact;
- var indent = options.indent;
- var oldIndent;
- var newLine = compact ? '' : '\n';
- var result;
- var isEmpty = true;
-
- if (json && argument && isFunction(argument.toJSON)) {
- argument = argument.toJSON();
- }
-
- if (!isString(argument)) {
- if (isArray(argument)) {
- result = [];
- options.wrap = true;
- oldIndent = options.__indent__;
- indent += oldIndent;
- options.__indent__ = indent;
- forEach(argument, function(value) {
- isEmpty = false;
- result.push(
- (compact ? '' : indent) +
- jsesc(value, options)
- );
- });
- if (isEmpty) {
- return '[]';
- }
- return '[' + newLine + result.join(',' + newLine) + newLine +
- (compact ? '' : oldIndent) + ']';
- } else if (!isObject(argument)) {
- if (json) {
- // For some values (e.g. `undefined`, `function` objects),
- // `JSON.stringify(value)` returns `undefined` (which isn’t valid
- // JSON) instead of `'null'`.
- return JSON.stringify(argument) || 'null';
- }
- return String(argument);
- } else { // it’s an object
- result = [];
- options.wrap = true;
- oldIndent = options.__indent__;
- indent += oldIndent;
- options.__indent__ = indent;
- forOwn(argument, function(key, value) {
- isEmpty = false;
- result.push(
- (compact ? '' : indent) +
- jsesc(key, options) + ':' +
- (compact ? '' : ' ') +
- jsesc(value, options)
- );
- });
- if (isEmpty) {
- return '{}';
- }
- return '{' + newLine + result.join(',' + newLine) + newLine +
- (compact ? '' : oldIndent) + '}';
- }
- }
-
- var string = argument;
- // Loop over each code unit in the string and escape it
- var index = -1;
- var length = string.length;
- var first;
- var second;
- var codePoint;
- result = '';
- while (++index < length) {
- var character = string.charAt(index);
- if (options.es6) {
- first = string.charCodeAt(index);
- if ( // check if it’s the start of a surrogate pair
- first >= 0xD800 && first <= 0xDBFF && // high surrogate
- length > index + 1 // there is a next code unit
- ) {
- second = string.charCodeAt(index + 1);
- if (second >= 0xDC00 && second <= 0xDFFF) { // low surrogate
- // https://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
- codePoint = (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000;
- var hexadecimal = codePoint.toString(16);
- if (!options.lowercaseHex) {
- hexadecimal = hexadecimal.toUpperCase();
- }
- result += '\\u{' + hexadecimal + '}';
- index++;
- continue;
- }
- }
- }
- if (!options.escapeEverything) {
- if (regexWhitelist.test(character)) {
- // It’s a printable ASCII character that is not `"`, `'` or `\`,
- // so don’t escape it.
- result += character;
- continue;
- }
- if (character == '"') {
- result += quote == character ? '\\"' : character;
- continue;
- }
- if (character == '\'') {
- result += quote == character ? '\\\'' : character;
- continue;
- }
- }
- if (
- character == '\0' &&
- !json &&
- !regexDigit.test(string.charAt(index + 1))
- ) {
- result += '\\0';
- continue;
- }
- if (regexSingleEscape.test(character)) {
- // no need for a `hasOwnProperty` check here
- result += singleEscapes[character];
- continue;
- }
- var charCode = character.charCodeAt(0);
- var hexadecimal = charCode.toString(16);
- if (!options.lowercaseHex) {
- hexadecimal = hexadecimal.toUpperCase();
- }
- var longhand = hexadecimal.length > 2 || json;
- var escaped = '\\' + (longhand ? 'u' : 'x') +
- ('0000' + hexadecimal).slice(longhand ? -4 : -2);
- result += escaped;
- continue;
- }
- if (options.wrap) {
- result = quote + result + quote;
- }
- return result;
- };
-
- jsesc.version = '1.0.0';
-
- /*--------------------------------------------------------------------------*/
-
- // Some AMD build optimizers, like r.js, check for specific condition patterns
- // like the following:
- if (
- typeof define == 'function' &&
- typeof define.amd == 'object' &&
- define.amd
- ) {
- define(function() {
- return jsesc;
- });
- } else if (freeExports && !freeExports.nodeType) {
- if (freeModule) { // in Node.js or RingoJS v0.8.0+
- freeModule.exports = jsesc;
- } else { // in Narwhal or RingoJS v0.7.0-
- freeExports.jsesc = jsesc;
- }
- } else { // in Rhino or a web browser
- root.jsesc = jsesc;
- }
-
-}(this));
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-10 07:46:58 +0000