Skip to content

Commit

Permalink
Merge pull request #11818 from Snuffleupagus/eslint-dot-notation
Browse files Browse the repository at this point in the history 
Enable the `dot-notation` ESLint rule
  • Loading branch information
@timvandermeij
timvandermeij authored Apr 17, 2020
2 parents c1733d2 + 1cc3dbb commit 7b23476
Show file tree
Hide file tree
Showing 26 changed files with 7,773 additions and 7,785 deletions.
1 change: 1 addition & 0 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
}],
"consistent-return": "error",
"curly": ["error", "all"],
"dot-notation": "error",
"eqeqeq": ["error", "always"],
"no-caller": "error",
"no-else-return": "error",
Expand Down
4 changes: 2 additions & 2 deletions examples/mobile-viewer/viewer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ var PDFViewerApplication = {
}
}

if (!pdfTitle && info && info["Title"]) {
pdfTitle = info["Title"];
if (!pdfTitle && info && info.Title) {
pdfTitle = info.Title;
}

if (pdfTitle) {
Expand Down
20 changes: 10 additions & 10 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ function createWebpackConfig(defines, output) {
var bundleDefines = builder.merge(defines, {
BUNDLE_VERSION: versionInfo.version,
BUNDLE_BUILD: versionInfo.commit,
TESTING: defines.TESTING || process.env["TESTING"] === "true",
TESTING: defines.TESTING || process.env.TESTING === "true",
});
var licenseHeaderLibre = fs
.readFileSync("./src/license_header_libre.js")
Expand Down Expand Up @@ -414,9 +414,9 @@ function createTestSource(testsName, bot) {
console.log();
console.log("### Running " + testsName + " tests");

var PDF_TEST = process.env["PDF_TEST"] || "test_manifest.json";
var PDF_TEST = process.env.PDF_TEST || "test_manifest.json";
var PDF_BROWSERS =
process.env["PDF_BROWSERS"] ||
process.env.PDF_BROWSERS ||
"resources/browser_manifests/browser_manifest.json";

if (!checkFile("test/" + PDF_BROWSERS)) {
Expand Down Expand Up @@ -467,7 +467,7 @@ function makeRef(done, bot) {
console.log("### Creating reference images");

var PDF_BROWSERS =
process.env["PDF_BROWSERS"] ||
process.env.PDF_BROWSERS ||
"resources/browser_manifests/browser_manifest.json";

if (!checkFile("test/" + PDF_BROWSERS)) {
Expand Down Expand Up @@ -1201,7 +1201,7 @@ function buildLib(defines, dir) {
var bundleDefines = builder.merge(defines, {
BUNDLE_VERSION: versionInfo.version,
BUNDLE_BUILD: versionInfo.commit,
TESTING: process.env["TESTING"] === "true",
TESTING: process.env.TESTING === "true",
});
var ctx = {
rootPath: __dirname,
Expand Down Expand Up @@ -1287,7 +1287,7 @@ gulp.task(
);

gulp.task("testing-pre", function (done) {
process.env["TESTING"] = "true";
process.env.TESTING = "true";
done();
});

Expand Down Expand Up @@ -1353,7 +1353,7 @@ gulp.task("baseline", function (done) {
console.log();
console.log("### Creating baseline environment");

var baselineCommit = process.env["BASELINE"];
var baselineCommit = process.env.BASELINE;
if (!baselineCommit) {
done(new Error("Missing baseline commit. Specify the BASELINE variable."));
return;
Expand Down Expand Up @@ -1552,7 +1552,7 @@ gulp.task("wintersmith", function (done) {

gulp.task("gh-pages-git", function (done) {
var VERSION = getVersionJSON().version;
var reason = process.env["PDFJS_UPDATE_REASON"];
var reason = process.env.PDFJS_UPDATE_REASON;

safeSpawnSync("git", ["init"], { cwd: GH_PAGES_DIR });
safeSpawnSync("git", ["remote", "add", "origin", REPO], {
Expand Down Expand Up @@ -1720,7 +1720,7 @@ gulp.task(
gulp.series("dist-pre", function (done) {
var distPath = DIST_DIR;
var opts = {};
var installPath = process.env["PDFJS_INSTALL_PATH"];
var installPath = process.env.PDFJS_INSTALL_PATH;
if (installPath) {
opts.cwd = installPath;
distPath = path.relative(installPath, distPath);
Expand All @@ -1738,7 +1738,7 @@ gulp.task(
console.log();
console.log("### Committing changes");

var reason = process.env["PDFJS_UPDATE_REASON"];
var reason = process.env.PDFJS_UPDATE_REASON;
// Attempt to work-around the broken link, see https://github.com/mozilla/pdf.js/issues/10391
if (typeof reason === "string") {
var reasonParts = /^(See )(mozilla\/pdf\.js)@tags\/(v\d+\.\d+\.\d+)\s*$/.exec(
Expand Down
14 changes: 7 additions & 7 deletions src/core/ccitt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,17 +473,17 @@ const CCITTFaxDecoder = (function CCITTFaxDecoder() {
this.source = source;
this.eof = false;

this.encoding = options["K"] || 0;
this.eoline = options["EndOfLine"] || false;
this.byteAlign = options["EncodedByteAlign"] || false;
this.columns = options["Columns"] || 1728;
this.rows = options["Rows"] || 0;
let eoblock = options["EndOfBlock"];
this.encoding = options.K || 0;
this.eoline = options.EndOfLine || false;
this.byteAlign = options.EncodedByteAlign || false;
this.columns = options.Columns || 1728;
this.rows = options.Rows || 0;
let eoblock = options.EndOfBlock;
if (eoblock === null || eoblock === undefined) {
eoblock = true;
}
this.eoblock = eoblock;
this.black = options["BlackIs1"] || false;
this.black = options.BlackIs1 || false;

this.codingLine = new Uint32Array(this.columns + 1);
this.refLine = new Uint32Array(this.columns + 2);
Expand Down
6 changes: 3 additions & 3 deletions src/core/document.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -725,10 +725,10 @@ class PDFDocument {
continue;
}

if (!docInfo["Custom"]) {
docInfo["Custom"] = Object.create(null);
if (!docInfo.Custom) {
docInfo.Custom = Object.create(null);
}
docInfo["Custom"][key] = customValue;
docInfo.Custom[key] = customValue;
}
}
}
Expand Down
152 changes: 76 additions & 76 deletions src/core/evaluator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3533,57 +3533,57 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
// If variableArgs === false: exactly `numArgs` expected
var getOPMap = getLookupTableFactory(function (t) {
// Graphic state
t["w"] = { id: OPS.setLineWidth, numArgs: 1, variableArgs: false };
t["J"] = { id: OPS.setLineCap, numArgs: 1, variableArgs: false };
t["j"] = { id: OPS.setLineJoin, numArgs: 1, variableArgs: false };
t["M"] = { id: OPS.setMiterLimit, numArgs: 1, variableArgs: false };
t["d"] = { id: OPS.setDash, numArgs: 2, variableArgs: false };
t["ri"] = { id: OPS.setRenderingIntent, numArgs: 1, variableArgs: false };
t["i"] = { id: OPS.setFlatness, numArgs: 1, variableArgs: false };
t["gs"] = { id: OPS.setGState, numArgs: 1, variableArgs: false };
t["q"] = { id: OPS.save, numArgs: 0, variableArgs: false };
t["Q"] = { id: OPS.restore, numArgs: 0, variableArgs: false };
t["cm"] = { id: OPS.transform, numArgs: 6, variableArgs: false };
t.w = { id: OPS.setLineWidth, numArgs: 1, variableArgs: false };
t.J = { id: OPS.setLineCap, numArgs: 1, variableArgs: false };
t.j = { id: OPS.setLineJoin, numArgs: 1, variableArgs: false };
t.M = { id: OPS.setMiterLimit, numArgs: 1, variableArgs: false };
t.d = { id: OPS.setDash, numArgs: 2, variableArgs: false };
t.ri = { id: OPS.setRenderingIntent, numArgs: 1, variableArgs: false };
t.i = { id: OPS.setFlatness, numArgs: 1, variableArgs: false };
t.gs = { id: OPS.setGState, numArgs: 1, variableArgs: false };
t.q = { id: OPS.save, numArgs: 0, variableArgs: false };
t.Q = { id: OPS.restore, numArgs: 0, variableArgs: false };
t.cm = { id: OPS.transform, numArgs: 6, variableArgs: false };

// Path
t["m"] = { id: OPS.moveTo, numArgs: 2, variableArgs: false };
t["l"] = { id: OPS.lineTo, numArgs: 2, variableArgs: false };
t["c"] = { id: OPS.curveTo, numArgs: 6, variableArgs: false };
t["v"] = { id: OPS.curveTo2, numArgs: 4, variableArgs: false };
t["y"] = { id: OPS.curveTo3, numArgs: 4, variableArgs: false };
t["h"] = { id: OPS.closePath, numArgs: 0, variableArgs: false };
t["re"] = { id: OPS.rectangle, numArgs: 4, variableArgs: false };
t["S"] = { id: OPS.stroke, numArgs: 0, variableArgs: false };
t["s"] = { id: OPS.closeStroke, numArgs: 0, variableArgs: false };
t["f"] = { id: OPS.fill, numArgs: 0, variableArgs: false };
t["F"] = { id: OPS.fill, numArgs: 0, variableArgs: false };
t.m = { id: OPS.moveTo, numArgs: 2, variableArgs: false };
t.l = { id: OPS.lineTo, numArgs: 2, variableArgs: false };
t.c = { id: OPS.curveTo, numArgs: 6, variableArgs: false };
t.v = { id: OPS.curveTo2, numArgs: 4, variableArgs: false };
t.y = { id: OPS.curveTo3, numArgs: 4, variableArgs: false };
t.h = { id: OPS.closePath, numArgs: 0, variableArgs: false };
t.re = { id: OPS.rectangle, numArgs: 4, variableArgs: false };
t.S = { id: OPS.stroke, numArgs: 0, variableArgs: false };
t.s = { id: OPS.closeStroke, numArgs: 0, variableArgs: false };
t.f = { id: OPS.fill, numArgs: 0, variableArgs: false };
t.F = { id: OPS.fill, numArgs: 0, variableArgs: false };
t["f*"] = { id: OPS.eoFill, numArgs: 0, variableArgs: false };
t["B"] = { id: OPS.fillStroke, numArgs: 0, variableArgs: false };
t.B = { id: OPS.fillStroke, numArgs: 0, variableArgs: false };
t["B*"] = { id: OPS.eoFillStroke, numArgs: 0, variableArgs: false };
t["b"] = { id: OPS.closeFillStroke, numArgs: 0, variableArgs: false };
t.b = { id: OPS.closeFillStroke, numArgs: 0, variableArgs: false };
t["b*"] = { id: OPS.closeEOFillStroke, numArgs: 0, variableArgs: false };
t["n"] = { id: OPS.endPath, numArgs: 0, variableArgs: false };
t.n = { id: OPS.endPath, numArgs: 0, variableArgs: false };

// Clipping
t["W"] = { id: OPS.clip, numArgs: 0, variableArgs: false };
t.W = { id: OPS.clip, numArgs: 0, variableArgs: false };
t["W*"] = { id: OPS.eoClip, numArgs: 0, variableArgs: false };

// Text
t["BT"] = { id: OPS.beginText, numArgs: 0, variableArgs: false };
t["ET"] = { id: OPS.endText, numArgs: 0, variableArgs: false };
t["Tc"] = { id: OPS.setCharSpacing, numArgs: 1, variableArgs: false };
t["Tw"] = { id: OPS.setWordSpacing, numArgs: 1, variableArgs: false };
t["Tz"] = { id: OPS.setHScale, numArgs: 1, variableArgs: false };
t["TL"] = { id: OPS.setLeading, numArgs: 1, variableArgs: false };
t["Tf"] = { id: OPS.setFont, numArgs: 2, variableArgs: false };
t["Tr"] = { id: OPS.setTextRenderingMode, numArgs: 1, variableArgs: false };
t["Ts"] = { id: OPS.setTextRise, numArgs: 1, variableArgs: false };
t["Td"] = { id: OPS.moveText, numArgs: 2, variableArgs: false };
t["TD"] = { id: OPS.setLeadingMoveText, numArgs: 2, variableArgs: false };
t["Tm"] = { id: OPS.setTextMatrix, numArgs: 6, variableArgs: false };
t.BT = { id: OPS.beginText, numArgs: 0, variableArgs: false };
t.ET = { id: OPS.endText, numArgs: 0, variableArgs: false };
t.Tc = { id: OPS.setCharSpacing, numArgs: 1, variableArgs: false };
t.Tw = { id: OPS.setWordSpacing, numArgs: 1, variableArgs: false };
t.Tz = { id: OPS.setHScale, numArgs: 1, variableArgs: false };
t.TL = { id: OPS.setLeading, numArgs: 1, variableArgs: false };
t.Tf = { id: OPS.setFont, numArgs: 2, variableArgs: false };
t.Tr = { id: OPS.setTextRenderingMode, numArgs: 1, variableArgs: false };
t.Ts = { id: OPS.setTextRise, numArgs: 1, variableArgs: false };
t.Td = { id: OPS.moveText, numArgs: 2, variableArgs: false };
t.TD = { id: OPS.setLeadingMoveText, numArgs: 2, variableArgs: false };
t.Tm = { id: OPS.setTextMatrix, numArgs: 6, variableArgs: false };
t["T*"] = { id: OPS.nextLine, numArgs: 0, variableArgs: false };
t["Tj"] = { id: OPS.showText, numArgs: 1, variableArgs: false };
t["TJ"] = { id: OPS.showSpacedText, numArgs: 1, variableArgs: false };
t.Tj = { id: OPS.showText, numArgs: 1, variableArgs: false };
t.TJ = { id: OPS.showSpacedText, numArgs: 1, variableArgs: false };
t["'"] = { id: OPS.nextLineShowText, numArgs: 1, variableArgs: false };
t['"'] = {
id: OPS.nextLineSetSpacingShowText,
Expand All @@ -3592,62 +3592,62 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
};

// Type3 fonts
t["d0"] = { id: OPS.setCharWidth, numArgs: 2, variableArgs: false };
t["d1"] = {
t.d0 = { id: OPS.setCharWidth, numArgs: 2, variableArgs: false };
t.d1 = {
id: OPS.setCharWidthAndBounds,
numArgs: 6,
variableArgs: false,
};

// Color
t["CS"] = { id: OPS.setStrokeColorSpace, numArgs: 1, variableArgs: false };
t["cs"] = { id: OPS.setFillColorSpace, numArgs: 1, variableArgs: false };
t["SC"] = { id: OPS.setStrokeColor, numArgs: 4, variableArgs: true };
t["SCN"] = { id: OPS.setStrokeColorN, numArgs: 33, variableArgs: true };
t["sc"] = { id: OPS.setFillColor, numArgs: 4, variableArgs: true };
t["scn"] = { id: OPS.setFillColorN, numArgs: 33, variableArgs: true };
t["G"] = { id: OPS.setStrokeGray, numArgs: 1, variableArgs: false };
t["g"] = { id: OPS.setFillGray, numArgs: 1, variableArgs: false };
t["RG"] = { id: OPS.setStrokeRGBColor, numArgs: 3, variableArgs: false };
t["rg"] = { id: OPS.setFillRGBColor, numArgs: 3, variableArgs: false };
t["K"] = { id: OPS.setStrokeCMYKColor, numArgs: 4, variableArgs: false };
t["k"] = { id: OPS.setFillCMYKColor, numArgs: 4, variableArgs: false };
t.CS = { id: OPS.setStrokeColorSpace, numArgs: 1, variableArgs: false };
t.cs = { id: OPS.setFillColorSpace, numArgs: 1, variableArgs: false };
t.SC = { id: OPS.setStrokeColor, numArgs: 4, variableArgs: true };
t.SCN = { id: OPS.setStrokeColorN, numArgs: 33, variableArgs: true };
t.sc = { id: OPS.setFillColor, numArgs: 4, variableArgs: true };
t.scn = { id: OPS.setFillColorN, numArgs: 33, variableArgs: true };
t.G = { id: OPS.setStrokeGray, numArgs: 1, variableArgs: false };
t.g = { id: OPS.setFillGray, numArgs: 1, variableArgs: false };
t.RG = { id: OPS.setStrokeRGBColor, numArgs: 3, variableArgs: false };
t.rg = { id: OPS.setFillRGBColor, numArgs: 3, variableArgs: false };
t.K = { id: OPS.setStrokeCMYKColor, numArgs: 4, variableArgs: false };
t.k = { id: OPS.setFillCMYKColor, numArgs: 4, variableArgs: false };

// Shading
t["sh"] = { id: OPS.shadingFill, numArgs: 1, variableArgs: false };
t.sh = { id: OPS.shadingFill, numArgs: 1, variableArgs: false };

// Images
t["BI"] = { id: OPS.beginInlineImage, numArgs: 0, variableArgs: false };
t["ID"] = { id: OPS.beginImageData, numArgs: 0, variableArgs: false };
t["EI"] = { id: OPS.endInlineImage, numArgs: 1, variableArgs: false };
t.BI = { id: OPS.beginInlineImage, numArgs: 0, variableArgs: false };
t.ID = { id: OPS.beginImageData, numArgs: 0, variableArgs: false };
t.EI = { id: OPS.endInlineImage, numArgs: 1, variableArgs: false };

// XObjects
t["Do"] = { id: OPS.paintXObject, numArgs: 1, variableArgs: false };
t["MP"] = { id: OPS.markPoint, numArgs: 1, variableArgs: false };
t["DP"] = { id: OPS.markPointProps, numArgs: 2, variableArgs: false };
t["BMC"] = { id: OPS.beginMarkedContent, numArgs: 1, variableArgs: false };
t["BDC"] = {
t.Do = { id: OPS.paintXObject, numArgs: 1, variableArgs: false };
t.MP = { id: OPS.markPoint, numArgs: 1, variableArgs: false };
t.DP = { id: OPS.markPointProps, numArgs: 2, variableArgs: false };
t.BMC = { id: OPS.beginMarkedContent, numArgs: 1, variableArgs: false };
t.BDC = {
id: OPS.beginMarkedContentProps,
numArgs: 2,
variableArgs: false,
};
t["EMC"] = { id: OPS.endMarkedContent, numArgs: 0, variableArgs: false };
t.EMC = { id: OPS.endMarkedContent, numArgs: 0, variableArgs: false };

// Compatibility
t["BX"] = { id: OPS.beginCompat, numArgs: 0, variableArgs: false };
t["EX"] = { id: OPS.endCompat, numArgs: 0, variableArgs: false };
t.BX = { id: OPS.beginCompat, numArgs: 0, variableArgs: false };
t.EX = { id: OPS.endCompat, numArgs: 0, variableArgs: false };

// (reserved partial commands for the lexer)
t["BM"] = null;
t["BD"] = null;
t["true"] = null;
t["fa"] = null;
t["fal"] = null;
t["fals"] = null;
t["false"] = null;
t["nu"] = null;
t["nul"] = null;
t["null"] = null;
t.BM = null;
t.BD = null;
t.true = null;
t.fa = null;
t.fal = null;
t.fals = null;
t.false = null;
t.nu = null;
t.nul = null;
t.null = null;
});

const MAX_INVALID_PATH_OPS = 20;
Expand Down
Loading

0 comments on commit 7b23476

Please sign in to comment.