From fb5e75668355d0802e6d6e582fb69f5de9b249ed Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 12:33:40 +0100 Subject: [PATCH 01/15] Fix errors reported by the `no-cond-assign` ESLint rule http://eslint.org/docs/rules/no-cond-assign --- src/shared/util.js | 2 +- web/compatibility.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/util.js b/src/shared/util.js index de33f2be9..c19a588e0 100644 --- a/src/shared/util.js +++ b/src/shared/util.js @@ -2166,7 +2166,7 @@ if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('MOZCENTRAL')) { err('\\ not allowed in relative path.'); } var tmp; - if (tmp = relativePathDotMapping[buffer.toLowerCase()]) { + if ((tmp = relativePathDotMapping[buffer.toLowerCase()])) { buffer = tmp; } if ('..' === buffer) { diff --git a/web/compatibility.js b/web/compatibility.js index f040e2a27..4300686e5 100644 --- a/web/compatibility.js +++ b/web/compatibility.js @@ -270,7 +270,7 @@ if (typeof PDFJS === 'undefined') { // initialize result and counters var bc = 0, bs, buffer, idx = 0, output = ''; // get next character - buffer = input.charAt(idx++); + (buffer = input.charAt(idx++)); // character found in table? // initialize bit storage and add its ascii value ~buffer && (bs = bc % 4 ? bs * 64 + buffer : buffer, From 25bf5db47ea421d476ccadc4d93178e59931ecfd Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 17:01:32 +0100 Subject: [PATCH 02/15] Fix errors reported by the `no-extra-boolean-cast` ESLint rule http://eslint.org/docs/rules/no-extra-boolean-cast --- src/core/fonts.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/fonts.js b/src/core/fonts.js index de81089b3..6364ba857 100644 --- a/src/core/fonts.js +++ b/src/core/fonts.js @@ -2943,6 +2943,7 @@ var ErrorFont = (function ErrorFontClosure() { function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) { var charCodeToGlyphId = Object.create(null); var glyphId, charCode, baseEncoding; + var isSymbolicFont = !!(properties.flags & FontFlags.Symbolic); if (properties.baseEncodingName) { // If a valid base encoding name was used, the mapping is initialized with @@ -2956,9 +2957,8 @@ function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) { charCodeToGlyphId[charCode] = 0; // notdef } } - } else if (!!(properties.flags & FontFlags.Symbolic)) { - // For a symbolic font the encoding should be the fonts built-in - // encoding. + } else if (isSymbolicFont) { + // For a symbolic font the encoding should be the fonts built-in encoding. for (charCode in builtInEncoding) { charCodeToGlyphId[charCode] = builtInEncoding[charCode]; } From 328e7397ea535f6919821d7a374e0daf9d67232f Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 13:58:06 +0100 Subject: [PATCH 03/15] Fix errors reported by the `no-extra-bind` ESLint rule http://eslint.org/docs/rules/no-extra-bind --- web/firefoxcom.js | 2 +- web/secondary_toolbar.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/firefoxcom.js b/web/firefoxcom.js index 05377113f..0b1a4122f 100644 --- a/web/firefoxcom.js +++ b/web/firefoxcom.js @@ -173,7 +173,7 @@ Preferences._readFromStorage = function (prefObj) { highlightAll: !!evt.detail.highlightAll, findPrevious: !!evt.detail.findPrevious }); - }.bind(this); + }; for (var i = 0, len = events.length; i < len; i++) { window.addEventListener(events[i], handleEvent); diff --git a/web/secondary_toolbar.js b/web/secondary_toolbar.js index eb43de586..427b947a0 100644 --- a/web/secondary_toolbar.js +++ b/web/secondary_toolbar.js @@ -188,7 +188,7 @@ var SecondaryToolbar = (function SecondaryToolbarClosure() { toggleHandToolButton.firstElementChild.textContent = mozL10n.get('hand_tool_enable_label', null, 'Enable hand tool'); } - }.bind(this)); + }); }, open: function SecondaryToolbar_open() { From 382094630190f83311cf4745e0711c7817cd7cec Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 14:28:27 +0100 Subject: [PATCH 04/15] Fix (most) errors reported by the `no-multi-spaces` ESLint rule http://eslint.org/docs/rules/no-multi-spaces --- gulpfile.js | 2 +- src/core/font_renderer.js | 2 +- src/core/jbig2.js | 2 +- src/core/jpg.js | 2 +- src/core/jpx.js | 4 ++-- src/display/api.js | 2 +- src/display/canvas.js | 4 ++-- src/display/webgl.js | 12 ++++++------ test/driver.js | 2 +- web/ui_utils.js | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index b7f2d4248..430ba60dd 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -197,7 +197,7 @@ function createBundle(defines) { case 'mainfile': // 'buildnumber' shall create BUILD_DIR for us tmpFile = BUILD_DIR + '~' + mainOutputName + '.tmp'; - bundle('src/pdf.js', tmpFile, 'src/', mainFiles, mainAMDName, + bundle('src/pdf.js', tmpFile, 'src/', mainFiles, mainAMDName, defines, true, versionJSON); this.push(new gutil.File({ cwd: '', diff --git a/src/core/font_renderer.js b/src/core/font_renderer.js index 3c4863357..08e97bd60 100644 --- a/src/core/font_renderer.js +++ b/src/core/font_renderer.js @@ -437,7 +437,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() { x = xb; y = yb; if (Math.abs(x - x0) > Math.abs(y - y0)) { x += stack.shift(); - } else { + } else { y += stack.shift(); } bezierCurveTo(xa, ya, xb, yb, x, y); diff --git a/src/core/jbig2.js b/src/core/jbig2.js index 6478111dc..ae82e5b6c 100644 --- a/src/core/jbig2.js +++ b/src/core/jbig2.js @@ -977,7 +977,7 @@ var Jbig2Image = (function Jbig2ImageClosure() { var combinationOperator = pageInfo.combinationOperatorOverride ? regionInfo.combinationOperator : pageInfo.combinationOperator; var buffer = this.buffer; - var mask0 = 128 >> (regionInfo.x & 7); + var mask0 = 128 >> (regionInfo.x & 7); var offset0 = regionInfo.y * rowSize + (regionInfo.x >> 3); var i, j, mask, offset; switch (combinationOperator) { diff --git a/src/core/jpg.js b/src/core/jpg.js index 0812c8705..d5a9bf836 100644 --- a/src/core/jpg.js +++ b/src/core/jpg.js @@ -616,7 +616,7 @@ var JpegImage = (function JpegImageClosure() { component = frame.components[i]; var blocksPerLine = Math.ceil(Math.ceil(frame.samplesPerLine / 8) * component.h / frame.maxH); - var blocksPerColumn = Math.ceil(Math.ceil(frame.scanLines / 8) * + var blocksPerColumn = Math.ceil(Math.ceil(frame.scanLines / 8) * component.v / frame.maxV); var blocksPerLineForMcu = mcusPerLine * component.h; var blocksPerColumnForMcu = mcusPerColumn * component.v; diff --git a/src/core/jpx.js b/src/core/jpx.js index dc8b73674..540b48e35 100644 --- a/src/core/jpx.js +++ b/src/core/jpx.js @@ -1484,7 +1484,7 @@ var JpxImage = (function JpxImageClosure() { var qcdOrQcc = (context.currentTile.QCC[c] !== undefined ? context.currentTile.QCC[c] : context.currentTile.QCD); component.quantizationParameters = qcdOrQcc; - var codOrCoc = (context.currentTile.COC[c] !== undefined ? + var codOrCoc = (context.currentTile.COC[c] !== undefined ? context.currentTile.COC[c] : context.currentTile.COD); component.codingStyleParameters = codOrCoc; } @@ -1552,7 +1552,7 @@ var JpxImage = (function JpxImageClosure() { })(); var InclusionTree = (function InclusionTreeClosure() { - function InclusionTree(width, height, defaultValue) { + function InclusionTree(width, height, defaultValue) { var levelsLength = log2(Math.max(width, height)) + 1; this.levels = []; for (var i = 0; i < levelsLength; i++) { diff --git a/src/display/api.js b/src/display/api.js index 0e37fb9a8..cb4ad0383 100644 --- a/src/display/api.js +++ b/src/display/api.js @@ -1314,7 +1314,7 @@ var PDFWorker = (function PDFWorkerClosure() { } try { sendTest(); - } catch (e) { + } catch (e) { // We need fallback to a faked worker. this._setupFakeWorker(); } diff --git a/src/display/canvas.js b/src/display/canvas.js index d09d15919..76f194931 100644 --- a/src/display/canvas.js +++ b/src/display/canvas.js @@ -654,7 +654,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() { } if (sourceCtx.setLineDash !== undefined) { destCtx.setLineDash(sourceCtx.getLineDash()); - destCtx.lineDashOffset = sourceCtx.lineDashOffset; + destCtx.lineDashOffset = sourceCtx.lineDashOffset; } } @@ -1862,7 +1862,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() { var cacheId = 'groupAt' + this.groupLevel; if (group.smask) { // Using two cache entries is case if masks are used one after another. - cacheId += '_smask_' + ((this.smaskCounter++) % 2); + cacheId += '_smask_' + ((this.smaskCounter++) % 2); } var scratchCanvas = this.cachedCanvases.getCanvas( cacheId, drawnWidth, drawnHeight, true); diff --git a/src/display/webgl.js b/src/display/webgl.js index bd4586184..83c64a707 100644 --- a/src/display/webgl.js +++ b/src/display/webgl.js @@ -165,12 +165,12 @@ var WebGLUtils = (function WebGLUtilsClosure() { var texCoordBuffer = gl.createBuffer(); gl.bindBuffer(gl.ARRAY_BUFFER, texCoordBuffer); gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([ - 0.0, 0.0, - 1.0, 0.0, - 0.0, 1.0, - 0.0, 1.0, - 1.0, 0.0, - 1.0, 1.0]), gl.STATIC_DRAW); + 0.0, 0.0, + 1.0, 0.0, + 0.0, 1.0, + 0.0, 1.0, + 1.0, 0.0, + 1.0, 1.0]), gl.STATIC_DRAW); gl.enableVertexAttribArray(texCoordLocation); gl.vertexAttribPointer(texCoordLocation, 2, gl.FLOAT, false, 0, 0); diff --git a/test/driver.js b/test/driver.js index b1ab04a3e..466cd2bed 100644 --- a/test/driver.js +++ b/test/driver.js @@ -288,7 +288,7 @@ var Driver = (function DriverClosure() { var self = this; window.onerror = function(message, source, line, column, error) { self._info('Error: ' + message + ' Script: ' + source + ' Line: ' + - line + ' Column: ' + column + ' StackTrace: ' + error); + line + ' Column: ' + column + ' StackTrace: ' + error); }; this._info('User agent: ' + navigator.userAgent); this._log('Harness thinks this browser is "' + this.browser + diff --git a/web/ui_utils.js b/web/ui_utils.js index 1090dc345..0592a0e72 100644 --- a/web/ui_utils.js +++ b/web/ui_utils.js @@ -260,7 +260,7 @@ function approximateFraction(x) { var limit = 8; if (xinv > limit) { return [1, limit]; - } else if (Math.floor(xinv) === xinv) { + } else if (Math.floor(xinv) === xinv) { return [1, xinv]; } From e53ab844cc55e1dae76cffd1bad480dcbcb09b12 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 14:57:41 +0100 Subject: [PATCH 05/15] Fix errors reported by the `no-useless-concat` ESLint rule http://eslint.org/docs/rules/no-useless-concat --- test/test.js | 2 +- test/unit/type1_parser_spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test.js b/test/test.js index f82937b11..fa588fd2b 100644 --- a/test/test.js +++ b/test/test.js @@ -81,7 +81,7 @@ function parseOptions() { 'test_manifest.json')) .check(describeCheck(function (argv) { return !argv.browser || !argv.browserManifestFile; - }, '--browser and --browserManifestFile must not be specified at the ' +'' + + }, '--browser and --browserManifestFile must not be specified at the ' + 'same time.')); var result = yargs.argv; if (result.help) { diff --git a/test/unit/type1_parser_spec.js b/test/unit/type1_parser_spec.js index 3d9a4424a..838dc4b94 100644 --- a/test/unit/type1_parser_spec.js +++ b/test/unit/type1_parser_spec.js @@ -73,7 +73,7 @@ describe('Type1Parser', function() { 'dup 0 1 RD x noaccess put\n'+ 'end\n' + '/CharStrings 46 dict dup begin\n' + - '/.notdef 1 RD x ND' + '\n' + + '/.notdef 1 RD x ND\n' + 'end'); var parser = new Type1Parser(stream, false, SEAC_ANALYSIS_ENABLED); var program = parser.extractFontProgram(); From 66d2637b3fc627b7c7b49da92e90053640110547 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 17:23:46 +0100 Subject: [PATCH 06/15] Fix errors reported by the `yoda` ESLint rule http://eslint.org/docs/rules/yoda --- src/core/crypto.js | 6 +++--- src/display/canvas.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/crypto.js b/src/core/crypto.js index 5803f52ab..d1fa3929a 100644 --- a/src/core/crypto.js +++ b/src/core/crypto.js @@ -2057,17 +2057,17 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() { return new NullCipher(); }; } - if ('V2' === cfm.name) { + if (cfm.name === 'V2') { return function cipherTransformFactoryBuildCipherConstructorV2() { return new ARCFourCipher(buildObjectKey(num, gen, key, false)); }; } - if ('AESV2' === cfm.name) { + if (cfm.name === 'AESV2') { return function cipherTransformFactoryBuildCipherConstructorAESV2() { return new AES128Cipher(buildObjectKey(num, gen, key, true)); }; } - if ('AESV3' === cfm.name) { + if (cfm.name === 'AESV3') { return function cipherTransformFactoryBuildCipherConstructorAESV3() { return new AES256Cipher(key); }; diff --git a/src/display/canvas.js b/src/display/canvas.js index 76f194931..47d07a901 100644 --- a/src/display/canvas.js +++ b/src/display/canvas.js @@ -1780,13 +1780,13 @@ var CanvasGraphics = (function CanvasGraphicsClosure() { this.save(); this.baseTransformStack.push(this.baseTransform); - if (isArray(matrix) && 6 === matrix.length) { + if (isArray(matrix) && matrix.length === 6) { this.transform.apply(this, matrix); } this.baseTransform = this.ctx.mozCurrentTransform; - if (isArray(bbox) && 4 === bbox.length) { + if (isArray(bbox) && bbox.length === 4) { var width = bbox[2] - bbox[0]; var height = bbox[3] - bbox[1]; this.ctx.rect(bbox[0], bbox[1], width, height); @@ -1947,7 +1947,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() { matrix) { this.save(); - if (isArray(rect) && 4 === rect.length) { + if (isArray(rect) && rect.length === 4) { var width = rect[2] - rect[0]; var height = rect[3] - rect[1]; this.ctx.rect(rect[0], rect[1], width, height); From ad915f8af1c54e6205c02f0dea62ea98ccefd926 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 19:58:36 +0100 Subject: [PATCH 07/15] Fix errors reported by the `comma-spacing` ESLint rule http://eslint.org/docs/rules/comma-spacing --- extensions/chromium/pdfHandler.js | 4 ++-- make.js | 2 +- src/core/annotation.js | 2 +- src/core/crypto.js | 28 ++++++++++++++-------------- src/display/svg.js | 4 ++-- src/display/webgl.js | 2 +- src/shared/cffStandardStrings.js | 2 +- test/unit/crypto_spec.js | 8 ++++---- web/pdf_document_properties.js | 20 ++++++++++---------- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/extensions/chromium/pdfHandler.js b/extensions/chromium/pdfHandler.js index d32491f6c..6e0b99817 100644 --- a/extensions/chromium/pdfHandler.js +++ b/extensions/chromium/pdfHandler.js @@ -72,7 +72,7 @@ function getHeaderFromHeaders(headers, headerName) { function isPdfFile(details) { var header = getHeaderFromHeaders(details.responseHeaders, 'content-type'); if (header) { - var headerValue = header.value.toLowerCase().split(';',1)[0].trim(); + var headerValue = header.value.toLowerCase().split(';', 1)[0].trim(); if (headerValue === 'application/pdf') { return true; } @@ -153,7 +153,7 @@ chrome.webRequest.onHeadersReceived.addListener( ], types: ['main_frame', 'sub_frame'] }, - ['blocking','responseHeaders']); + ['blocking', 'responseHeaders']); chrome.webRequest.onBeforeRequest.addListener( function onBeforeRequestForFTP(details) { diff --git a/make.js b/make.js index 1a8fc73fd..80cf970d9 100644 --- a/make.js +++ b/make.js @@ -883,7 +883,7 @@ target.chromium = function() { 'extensions/chromium/*.html', 'extensions/chromium/*.js', 'extensions/chromium/*.css', - 'extensions/chromium/icon*.png',], + 'extensions/chromium/icon*.png'], CHROME_BUILD_DIR], ['extensions/chromium/pageAction/*.*', CHROME_BUILD_DIR + '/pageAction'], ['extensions/chromium/options/*.*', CHROME_BUILD_DIR + '/options'], diff --git a/src/core/annotation.js b/src/core/annotation.js index 9c5b2f5b8..7fb6a13f4 100644 --- a/src/core/annotation.js +++ b/src/core/annotation.js @@ -435,7 +435,7 @@ var Annotation = (function AnnotationClosure() { // Properties ]); var bbox = appearanceDict.getArray('BBox') || [0, 0, 1, 1]; - var matrix = appearanceDict.getArray('Matrix') || [1, 0, 0, 1, 0 ,0]; + var matrix = appearanceDict.getArray('Matrix') || [1, 0, 0, 1, 0, 0]; var transform = getTransformMatrix(data.rect, bbox, matrix); var self = this; diff --git a/src/core/crypto.js b/src/core/crypto.js index d1fa3929a..b7e3bd5f7 100644 --- a/src/core/crypto.js +++ b/src/core/crypto.js @@ -609,22 +609,22 @@ var calculateSHA512 = (function calculateSHA512Closure() { var result; if (!mode384) { result = new Uint8Array(64); - h0.copyTo(result,0); - h1.copyTo(result,8); - h2.copyTo(result,16); - h3.copyTo(result,24); - h4.copyTo(result,32); - h5.copyTo(result,40); - h6.copyTo(result,48); - h7.copyTo(result,56); + h0.copyTo(result, 0); + h1.copyTo(result, 8); + h2.copyTo(result, 16); + h3.copyTo(result, 24); + h4.copyTo(result, 32); + h5.copyTo(result, 40); + h6.copyTo(result, 48); + h7.copyTo(result, 56); } else { result = new Uint8Array(48); - h0.copyTo(result,0); - h1.copyTo(result,8); - h2.copyTo(result,16); - h3.copyTo(result,24); - h4.copyTo(result,32); - h5.copyTo(result,40); + h0.copyTo(result, 0); + h1.copyTo(result, 8); + h2.copyTo(result, 16); + h3.copyTo(result, 24); + h4.copyTo(result, 32); + h5.copyTo(result, 40); } return result; } diff --git a/src/display/svg.js b/src/display/svg.js index 92be5e788..9530095c7 100644 --- a/src/display/svg.js +++ b/src/display/svg.js @@ -841,7 +841,7 @@ var SVGGraphics = (function SVGGraphicsClosure() { var height = args[j++]; var xw = x + width; var yh = y + height; - d.push('M', pf(x), pf(y), 'L', pf(xw) , pf(y), 'L', pf(xw), pf(yh), + d.push('M', pf(x), pf(y), 'L', pf(xw), pf(y), 'L', pf(xw), pf(yh), 'L', pf(x), pf(yh), 'Z'); break; case OPS.moveTo: @@ -852,7 +852,7 @@ var SVGGraphics = (function SVGGraphicsClosure() { case OPS.lineTo: x = args[j++]; y = args[j++]; - d.push('L', pf(x) , pf(y)); + d.push('L', pf(x), pf(y)); break; case OPS.curveTo: x = args[j + 4]; diff --git a/src/display/webgl.js b/src/display/webgl.js index 83c64a707..4c02fd7ca 100644 --- a/src/display/webgl.js +++ b/src/display/webgl.js @@ -186,7 +186,7 @@ var WebGLUtils = (function WebGLUtilsClosure() { if (!smaskCache) { initSmaskGL(); } - var cache = smaskCache,canvas = cache.canvas, gl = cache.gl; + var cache = smaskCache, canvas = cache.canvas, gl = cache.gl; canvas.width = width; canvas.height = height; gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight); diff --git a/src/shared/cffStandardStrings.js b/src/shared/cffStandardStrings.js index 7fa8ef782..fbfc1378b 100644 --- a/src/shared/cffStandardStrings.js +++ b/src/shared/cffStandardStrings.js @@ -148,7 +148,7 @@ var CFFDictDataMap = { }, '7': { name: 'FontMatrix', - operand: [0.001, 0, 0, 0.001, 0 , 0] + operand: [0.001, 0, 0, 0.001, 0, 0] }, '8': { name: 'StrokeWidth', diff --git a/test/unit/crypto_spec.js b/test/unit/crypto_spec.js index 4d67bc9a0..f4b7aa2b5 100644 --- a/test/unit/crypto_spec.js +++ b/test/unit/crypto_spec.js @@ -250,7 +250,7 @@ describe('crypto', function() { key = hex2binary('000102030405060708090a0b0c0d0e0f'); iv = hex2binary('00000000000000000000000000000000'); cipher = new AES128Cipher(key); - result = cipher.encrypt(input,iv); + result = cipher.encrypt(input, iv); expected = hex2binary('69c4e0d86a7b0430d8cdb78070b4c55a'); expect(result).toEqual(expected); }); @@ -279,7 +279,7 @@ describe('crypto', function() { '191a1b1c1d1e1f'); iv = hex2binary('00000000000000000000000000000000'); cipher = new AES256Cipher(key); - result = cipher.encrypt(input,iv); + result = cipher.encrypt(input, iv); expected = hex2binary('8ea2b7ca516745bfeafc49904b496089'); expect(result).toEqual(expected); }); @@ -293,7 +293,7 @@ describe('crypto', function() { '191a1b1c1d1e1f'); iv = hex2binary('00000000000000000000000000000000'); cipher = new AES256Cipher(key); - result = cipher.decryptBlock(input,false,iv); + result = cipher.decryptBlock(input, false, iv); expected = hex2binary('00112233445566778899aabbccddeeff'); expect(result).toEqual(expected); }); @@ -304,7 +304,7 @@ describe('crypto', function() { key = hex2binary('000102030405060708090a0b0c0d0e0f101112131415161718' + '191a1b1c1d1e1f'); cipher = new AES256Cipher(key); - result = cipher.decryptBlock(input,false); + result = cipher.decryptBlock(input, false); expected = hex2binary('00112233445566778899aabbccddeeff'); expect(result).toEqual(expected); }); diff --git a/web/pdf_document_properties.js b/web/pdf_document_properties.js index 141c499a1..0e7471c39 100644 --- a/web/pdf_document_properties.js +++ b/web/pdf_document_properties.js @@ -200,22 +200,22 @@ var PDFDocumentProperties = (function PDFDocumentPropertiesClosure() { } // Remove the D: prefix if it is available. - if (dateToParse.substring(0,2) === 'D:') { + if (dateToParse.substring(0, 2) === 'D:') { dateToParse = dateToParse.substring(2); } // Get all elements from the PDF date string. // JavaScript's Date object expects the month to be between // 0 and 11 instead of 1 and 12, so we're correcting for this. - var year = parseInt(dateToParse.substring(0,4), 10); - var month = parseInt(dateToParse.substring(4,6), 10) - 1; - var day = parseInt(dateToParse.substring(6,8), 10); - var hours = parseInt(dateToParse.substring(8,10), 10); - var minutes = parseInt(dateToParse.substring(10,12), 10); - var seconds = parseInt(dateToParse.substring(12,14), 10); - var utRel = dateToParse.substring(14,15); - var offsetHours = parseInt(dateToParse.substring(15,17), 10); - var offsetMinutes = parseInt(dateToParse.substring(18,20), 10); + var year = parseInt(dateToParse.substring(0, 4), 10); + var month = parseInt(dateToParse.substring(4, 6), 10) - 1; + var day = parseInt(dateToParse.substring(6, 8), 10); + var hours = parseInt(dateToParse.substring(8, 10), 10); + var minutes = parseInt(dateToParse.substring(10, 12), 10); + var seconds = parseInt(dateToParse.substring(12, 14), 10); + var utRel = dateToParse.substring(14, 15); + var offsetHours = parseInt(dateToParse.substring(15, 17), 10); + var offsetMinutes = parseInt(dateToParse.substring(18, 20), 10); // As per spec, utRel = 'Z' means equal to universal time. // The other cases ('-' and '+') have to be handled here. From 6606540fe419abf0e3dca72ea90766b8c2f292ba Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 21:10:29 +0100 Subject: [PATCH 08/15] Fix errors reported by the `func-call-spacing` ESLint rule http://eslint.org/docs/rules/func-call-spacing --- external/umdutils/verifier.js | 2 +- test/unit/primitives_spec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/umdutils/verifier.js b/external/umdutils/verifier.js index e61c6afd0..f5678fd0b 100644 --- a/external/umdutils/verifier.js +++ b/external/umdutils/verifier.js @@ -210,7 +210,7 @@ function readDependencies(rootPaths) { } }); if (discovered.length === 0) { - throw new Error ('Some circular references exist: somewhere at ' + + throw new Error('Some circular references exist: somewhere at ' + left.join(',')); } discovered.sort(); diff --git a/test/unit/primitives_spec.js b/test/unit/primitives_spec.js index 7dd150aa8..29c00e2ab 100644 --- a/test/unit/primitives_spec.js +++ b/test/unit/primitives_spec.js @@ -346,12 +346,12 @@ describe('primitives', function() { }); describe('isRef', function () { - it ('handles non-refs', function () { + it('handles non-refs', function () { var nonRef = {}; expect(isRef(nonRef)).toEqual(false); }); - it ('handles refs', function () { + it('handles refs', function () { var ref = new Ref(1, 0); expect(isRef(ref)).toEqual(true); }); From 86ba634c97e60dee87fc1d5bd17867d062e40db4 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 21:17:11 +0100 Subject: [PATCH 09/15] Fix errors reported by the `key-spacing` ESLint rule http://eslint.org/docs/rules/key-spacing --- src/core/type1_parser.js | 4 ++-- web/viewer.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/type1_parser.js b/src/core/type1_parser.js index 6c7db2407..64333c924 100644 --- a/src/core/type1_parser.js +++ b/src/core/type1_parser.js @@ -86,7 +86,7 @@ var Type1CharString = (function Type1CharStringClosure() { 'rrcurveto': [8], 'callsubr': [10], 'flex': [12, 35], - 'drop' : [12, 18], + 'drop': [12, 18], 'endchar': [14], 'rmoveto': [21], 'hmoveto': [22], @@ -483,7 +483,7 @@ var Type1Parser = (function Type1ParserClosure() { return token === 'true' ? 1 : 0; }, - nextChar : function Type1_nextChar() { + nextChar: function Type1_nextChar() { return (this.currentChar = this.stream.getByte()); }, diff --git a/web/viewer.js b/web/viewer.js index c4fafe512..d3dd4507a 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -54,7 +54,7 @@ function getViewerConfiguration() { return { appContainer: document.body, mainContainer: document.getElementById('viewerContainer'), - viewerContainer: document.getElementById('viewer'), + viewerContainer: document.getElementById('viewer'), eventBus: null, // using global event bus with DOM events toolbar: { container: document.getElementById('toolbarViewer'), From c36468cbce3175ba6409e423eeaf2621322f222b Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Mon, 12 Dec 2016 20:18:48 +0100 Subject: [PATCH 10/15] Fix errors reported by the `keyword-spacing` ESLint rule http://eslint.org/docs/rules/keyword-spacing --- src/core/chunked_stream.js | 2 +- src/core/pdf_manager.js | 2 +- src/core/type1_parser.js | 2 +- src/display/text_layer.js | 2 +- src/shared/util.js | 2 +- test/stats/statcmp.js | 4 ++-- web/ui_utils.js | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/chunked_stream.js b/src/core/chunked_stream.js index f32a16c75..f82b48f69 100644 --- a/src/core/chunked_stream.js +++ b/src/core/chunked_stream.js @@ -568,7 +568,7 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() { if (this.pdfNetworkStream) { this.pdfNetworkStream.cancelAllRequests('abort'); } - for(var requestId in this.promisesByRequest) { + for (var requestId in this.promisesByRequest) { var capability = this.promisesByRequest[requestId]; capability.reject(new Error('Request was aborted')); } diff --git a/src/core/pdf_manager.js b/src/core/pdf_manager.js index 15656da0c..c8ffaede7 100644 --- a/src/core/pdf_manager.js +++ b/src/core/pdf_manager.js @@ -210,7 +210,7 @@ var NetworkPdfManager = (function NetworkPdfManagerClosure() { result = value; } resolve(result); - } catch(e) { + } catch (e) { if (!(e instanceof MissingDataException)) { reject(e); return; diff --git a/src/core/type1_parser.js b/src/core/type1_parser.js index 64333c924..935faf552 100644 --- a/src/core/type1_parser.js +++ b/src/core/type1_parser.js @@ -550,7 +550,7 @@ var Type1Parser = (function Type1ParserClosure() { this.getToken(); // read in 'dict' this.getToken(); // read in 'dup' this.getToken(); // read in 'begin' - while(true) { + while (true) { token = this.getToken(); if (token === null || token === 'end') { break; diff --git a/src/display/text_layer.js b/src/display/text_layer.js index 19e5748f8..d14a5f6be 100644 --- a/src/display/text_layer.js +++ b/src/display/text_layer.js @@ -374,7 +374,7 @@ var renderTextLayer = (function renderTextLayerClosure() { i++; } var j = horizon.length - 1; - while(j >= 0 && horizon[j].start >= boundary.y2) { + while (j >= 0 && horizon[j].start >= boundary.y2) { j--; } diff --git a/src/shared/util.js b/src/shared/util.js index c19a588e0..e781eff47 100644 --- a/src/shared/util.js +++ b/src/shared/util.js @@ -1766,7 +1766,7 @@ if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('MOZCENTRAL')) { u.pathname = 'c%20d'; hasWorkingUrl = u.href === 'http://a/c%20d'; } - } catch(e) { } + } catch (e) { } if (hasWorkingUrl) { return; diff --git a/test/stats/statcmp.js b/test/stats/statcmp.js index 37b8bf66b..580c17306 100644 --- a/test/stats/statcmp.js +++ b/test/stats/statcmp.js @@ -179,14 +179,14 @@ function main() { try { var baselineFile = fs.readFileSync(options.baseline).toString(); baseline = flatten(JSON.parse(baselineFile)); - } catch(e) { + } catch (e) { console.log('Error reading file "' + options.baseline + '": ' + e); process.exit(0); } try { var currentFile = fs.readFileSync(options.current).toString(); current = flatten(JSON.parse(currentFile)); - } catch(e) { + } catch (e) { console.log('Error reading file "' + options.current + '": ' + e); process.exit(0); } diff --git a/web/ui_utils.js b/web/ui_utils.js index 0592a0e72..4ec78c1e1 100644 --- a/web/ui_utils.js +++ b/web/ui_utils.js @@ -384,7 +384,7 @@ function getPDFFileNameFromURL(url) { try { suggestedFilename = reFilename.exec(decodeURIComponent(suggestedFilename))[0]; - } catch(e) { // Possible (extremely rare) errors: + } catch (e) { // Possible (extremely rare) errors: // URIError "Malformed URI", e.g. for "%AA.pdf" // TypeError "null has no properties", e.g. for "%2F.pdf" } From efbb1e9b1c1ede2f43eeb1d8e4a3994a7769f8de Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 21:33:39 +0100 Subject: [PATCH 11/15] Fix errors reported by the `new-cap` ESLint rule http://eslint.org/docs/rules/new-cap --- src/core/crypto.js | 8 ++++---- test/unit/api_spec.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/crypto.js b/src/core/crypto.js index b7e3bd5f7..6d63266dc 100644 --- a/src/core/crypto.js +++ b/src/core/crypto.js @@ -1729,13 +1729,13 @@ var PDF20 = (function PDF20Closure() { var CipherTransform = (function CipherTransformClosure() { function CipherTransform(stringCipherConstructor, streamCipherConstructor) { - this.stringCipherConstructor = stringCipherConstructor; - this.streamCipherConstructor = streamCipherConstructor; + this.StringCipherConstructor = stringCipherConstructor; + this.StreamCipherConstructor = streamCipherConstructor; } CipherTransform.prototype = { createStream: function CipherTransform_createStream(stream, length) { - var cipher = new this.streamCipherConstructor(); + var cipher = new this.StreamCipherConstructor(); return new DecryptStream(stream, length, function cipherTransformDecryptStream(data, finalize) { return cipher.decryptBlock(data, finalize); @@ -1743,7 +1743,7 @@ var CipherTransform = (function CipherTransformClosure() { ); }, decryptString: function CipherTransform_decryptString(s) { - var cipher = new this.stringCipherConstructor(); + var cipher = new this.StringCipherConstructor(); var data = stringToBytes(s); data = cipher.decryptBlock(data, true); return bytesToString(data); diff --git a/test/unit/api_spec.js b/test/unit/api_spec.js index d4c2f5773..06484106b 100644 --- a/test/unit/api_spec.js +++ b/test/unit/api_spec.js @@ -505,7 +505,7 @@ describe('api', function() { // PageLabels with bad "Prefix" entries. var url3 = new URL('../pdfs/bad-PageLabels.pdf', window.location).href; - var loadingTask3 = new PDFJS.getDocument(url3); + var loadingTask3 = PDFJS.getDocument(url3); var promise3 = loadingTask3.promise.then(function (pdfDoc) { return pdfDoc.getPageLabels(); }); From aae27e76bbcd59e70b0f62436a69ac692fe4fb1b Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 21:47:52 +0100 Subject: [PATCH 12/15] Fix errors reported by the `no-multiple-empty-lines` ESLint rule http://eslint.org/docs/rules/no-multiple-empty-lines --- extensions/firefox/content/PdfjsChromeUtils.jsm | 1 - external/crlfchecker/crlfchecker.js | 1 - test/unit/jasmine-boot.js | 1 - test/unit/ui_utils_spec.js | 1 - 4 files changed, 4 deletions(-) diff --git a/extensions/firefox/content/PdfjsChromeUtils.jsm b/extensions/firefox/content/PdfjsChromeUtils.jsm index b5f2a62f2..2ce624619 100644 --- a/extensions/firefox/content/PdfjsChromeUtils.jsm +++ b/extensions/firefox/content/PdfjsChromeUtils.jsm @@ -338,4 +338,3 @@ var PdfjsChromeUtils = { }); } }; - diff --git a/external/crlfchecker/crlfchecker.js b/external/crlfchecker/crlfchecker.js index 5eae86cf0..f331daebe 100644 --- a/external/crlfchecker/crlfchecker.js +++ b/external/crlfchecker/crlfchecker.js @@ -24,4 +24,3 @@ function checkIfCrlfIsPresent(files) { } exports.checkIfCrlfIsPresent = checkIfCrlfIsPresent; - diff --git a/test/unit/jasmine-boot.js b/test/unit/jasmine-boot.js index fd2bc64a3..03cdfcb81 100644 --- a/test/unit/jasmine-boot.js +++ b/test/unit/jasmine-boot.js @@ -203,4 +203,3 @@ function initializePDFJS(callback) { return destination; } }()); - diff --git a/test/unit/ui_utils_spec.js b/test/unit/ui_utils_spec.js index d93b16fa5..514e59aee 100644 --- a/test/unit/ui_utils_spec.js +++ b/test/unit/ui_utils_spec.js @@ -117,4 +117,3 @@ describe('ui_utils', function() { }); }); }); - From 551eb263e3e73dc56b9e8122dfac3bba455c677a Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 10 Dec 2016 22:15:23 +0100 Subject: [PATCH 13/15] Fix errors reported by the `semi-spacing` ESLint rule http://eslint.org/docs/rules/semi-spacing --- src/shared/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/util.js b/src/shared/util.js index e781eff47..3c5ac5f1f 100644 --- a/src/shared/util.js +++ b/src/shared/util.js @@ -557,7 +557,7 @@ function arraysToBytes(arr) { } var resultLength = 0; var i, ii = arr.length; - var item, itemLength ; + var item, itemLength; for (i = 0; i < ii; i++) { item = arr[i]; itemLength = arrayByteLength(item); From 68bf47d55d032bbc1bc6a3f5e62f86cc377e3803 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sun, 11 Dec 2016 10:53:17 +0100 Subject: [PATCH 14/15] Fix errors reported by the `space-before-function-paren` ESLint rule http://eslint.org/docs/rules/space-before-function-paren --- src/core/murmurhash3.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/murmurhash3.js b/src/core/murmurhash3.js index cb5a6c4f7..c45bcc03e 100644 --- a/src/core/murmurhash3.js +++ b/src/core/murmurhash3.js @@ -32,12 +32,12 @@ var Uint32ArrayView = sharedUtil.Uint32ArrayView; -var MurmurHash3_64 = (function MurmurHash3_64Closure (seed) { +var MurmurHash3_64 = (function MurmurHash3_64Closure(seed) { // Workaround for missing math precision in JS. var MASK_HIGH = 0xffff0000; var MASK_LOW = 0xffff; - function MurmurHash3_64 (seed) { + function MurmurHash3_64(seed) { var SEED = 0xc3d2e1f0; this.h1 = seed ? seed & 0xffffffff : SEED; this.h2 = seed ? seed & 0xffffffff : SEED; @@ -145,7 +145,7 @@ var MurmurHash3_64 = (function MurmurHash3_64Closure (seed) { return this; }, - hexdigest: function MurmurHash3_64_hexdigest () { + hexdigest: function MurmurHash3_64_hexdigest() { var h1 = this.h1; var h2 = this.h2; From 28e50cfa21f4e33d65564d33e8a1aca50b50488f Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sun, 11 Dec 2016 10:43:09 +0100 Subject: [PATCH 15/15] Fix errors reported by the `space-infix-ops` ESLint rule http://eslint.org/docs/rules/space-infix-ops --- extensions/chromium/pdfHandler.js | 2 +- external/builder/preprocessor2.js | 2 +- src/core/parser.js | 2 +- src/shared/util.js | 6 +++--- test/stats/statcmp.js | 2 +- test/unit/type1_parser_spec.js | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/chromium/pdfHandler.js b/extensions/chromium/pdfHandler.js index 6e0b99817..07b8457f0 100644 --- a/extensions/chromium/pdfHandler.js +++ b/extensions/chromium/pdfHandler.js @@ -54,7 +54,7 @@ function isPdfDownloadable(details) { * @return {undefined|{name: string, value: string}} The header, if found. */ function getHeaderFromHeaders(headers, headerName) { - for (var i=0; i