From a3393e0d949d4eb27f41236b143fe7ea4fd5f332 Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Thu, 28 Sep 2017 14:55:03 +0100 Subject: [PATCH] Bug 1403928 - Remove unused config/string-format.js, and mark config as a no-js-files directory in .eslintignore. r=glandium config/string-format.js was made obsolete in the removals in bug 1227388. MozReview-Commit-ID: 1nQwlKhoC0e --HG-- extra : rebase_source : 6b06e4d7ca2e8fc66fc2d93ade54c813d975acec --- .eslintignore | 2 +- config/string-format.js | 65 ----------------------------------------- 2 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 config/string-format.js diff --git a/.eslintignore b/.eslintignore index 3ef0526baf20..c0b4a8fa055e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -8,7 +8,6 @@ obj*/** # If you are enabling a directory, please add directory specific exclusions # below. chrome/** -config/** docshell/** editor/** embedding/** @@ -36,6 +35,7 @@ xpcom/** # We currently have no js files in these directories, so we ignore them by # default to aid ESLint's performance. build/** +config/** db/** gradle/** hal/** diff --git a/config/string-format.js b/config/string-format.js deleted file mode 100644 index 7319eb859896..000000000000 --- a/config/string-format.js +++ /dev/null @@ -1,65 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -String.prototype.format = function string_format() { - // there are two modes of operation... unnamed indices are read in order; - // named indices using %(name)s. The two styles cannot be mixed. - // Unnamed indices can be passed as either a single argument to this function, - // multiple arguments to this function, or as a single array argument - let curindex = 0; - let d; - - if (arguments.length > 1) { - d = arguments; - } - else - d = arguments[0]; - - function r(s, key, type) { - if (type == '%') - return '%'; - - let v; - if (key == "") { - if (curindex == -1) - throw Error("Cannot mix named and positional indices in string formatting."); - - if (curindex == 0 && (!(d instanceof Object) || !(0 in d))) { - v = d; - } - else if (!(curindex in d)) - throw Error("Insufficient number of items in format, requesting item %i".format(curindex)); - else { - v = d[curindex]; - } - - ++curindex; - } - else { - key = key.slice(1, -1); - if (curindex > 0) - throw Error("Cannot mix named and positional indices in string formatting."); - curindex = -1; - - if (!(key in d)) - throw Error("Key '%s' not present during string substitution.".format(key)); - v = d[key]; - } - switch (type) { - case "s": - if (v === undefined) - return ""; - return v.toString(); - case "r": - return uneval(v); - case "i": - return parseInt(v); - case "f": - return Number(v); - default: - throw Error("Unexpected format character '%s'.".format(type)); - } - } - return this.replace(/%(\([^)]+\))?(.)/g, r); -};