Skip to content

Commit 1abdcba

Browse files
timvandermeijtimvandermeij
authored
Merge pull request #13087 from Snuffleupagus/eslint-examples-no-var
Enable the ESLint `no-var` rule in the `examples/` folder
2 parents ba56732 + d144d01 commit 1abdcba

File tree

16 files changed

+212
-207
lines changed

16 files changed

+212
-207
lines changed

‎examples/.eslintrc

+5
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@
88
"pdfjsLib": false,
99
"pdfjsViewer": false,
1010
},
11+
12+
"rules": {
13+
// ECMAScript 6
14+
"no-var": "error",
15+
},
1116
}

‎examples/browserify/gulpfile.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
var gulp = require("gulp");
2-
var browserify = require("browserify");
3-
var streamify = require("gulp-streamify");
4-
var rename = require("gulp-rename");
5-
var uglify = require("gulp-uglify");
6-
var source = require("vinyl-source-stream");
1+
const gulp = require("gulp");
2+
const browserify = require("browserify");
3+
const streamify = require("gulp-streamify");
4+
const rename = require("gulp-rename");
5+
const uglify = require("gulp-uglify");
6+
const source = require("vinyl-source-stream");
77

8-
var OUTPUT_PATH = "../../build/browserify";
9-
var TMP_FILE_PREFIX = "../../build/browserify_";
8+
const OUTPUT_PATH = "../../build/browserify";
9+
const TMP_FILE_PREFIX = "../../build/browserify_";
1010

1111
gulp.task("build-bundle", function () {
1212
return browserify("main.js", { output: TMP_FILE_PREFIX + "main.tmp" })
@@ -20,7 +20,7 @@ gulp.task("build-bundle", function () {
2020

2121
gulp.task("build-worker", function () {
2222
// We can create our own viewer (see worker.js) or use already defined one.
23-
var workerSrc = require.resolve("pdfjs-dist/build/pdf.worker.entry");
23+
const workerSrc = require.resolve("pdfjs-dist/build/pdf.worker.entry");
2424
return browserify(workerSrc, { output: TMP_FILE_PREFIX + "worker.tmp" })
2525
.bundle()
2626
.pipe(source(TMP_FILE_PREFIX + "worker.tmp"))

‎examples/browserify/main.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33

44
// Hello world example for browserify.
55

6-
var pdfjsLib = require("pdfjs-dist");
6+
const pdfjsLib = require("pdfjs-dist");
77

8-
var pdfPath = "../learning/helloworld.pdf";
8+
const pdfPath = "../learning/helloworld.pdf";
99

1010
// Setting worker path to worker bundle.
1111
pdfjsLib.GlobalWorkerOptions.workerSrc =
1212
"../../build/browserify/pdf.worker.bundle.js";
1313

1414
// Loading a document.
15-
var loadingTask = pdfjsLib.getDocument(pdfPath);
15+
const loadingTask = pdfjsLib.getDocument(pdfPath);
1616
loadingTask.promise
1717
.then(function (pdfDocument) {
1818
// Request a first page
1919
return pdfDocument.getPage(1).then(function (pdfPage) {
2020
// Display page on the existing canvas with 100% scale.
21-
var viewport = pdfPage.getViewport({ scale: 1.0 });
22-
var canvas = document.getElementById("theCanvas");
21+
const viewport = pdfPage.getViewport({ scale: 1.0 });
22+
const canvas = document.getElementById("theCanvas");
2323
canvas.width = viewport.width;
2424
canvas.height = viewport.height;
25-
var ctx = canvas.getContext("2d");
26-
var renderTask = pdfPage.render({
25+
const ctx = canvas.getContext("2d");
26+
const renderTask = pdfPage.render({
2727
canvasContext: ctx,
2828
viewport,
2929
});

‎examples/components/pageviewer.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ pdfjsLib.GlobalWorkerOptions.workerSrc =
2727

2828
// Some PDFs need external cmaps.
2929
//
30-
var CMAP_URL = "../../node_modules/pdfjs-dist/cmaps/";
31-
var CMAP_PACKED = true;
30+
const CMAP_URL = "../../node_modules/pdfjs-dist/cmaps/";
31+
const CMAP_PACKED = true;
3232

33-
var DEFAULT_URL = "../../web/compressed.tracemonkey-pldi-09.pdf";
34-
var PAGE_TO_VIEW = 1;
35-
var SCALE = 1.0;
33+
const DEFAULT_URL = "../../web/compressed.tracemonkey-pldi-09.pdf";
34+
const PAGE_TO_VIEW = 1;
35+
const SCALE = 1.0;
3636

37-
var container = document.getElementById("pageContainer");
37+
const container = document.getElementById("pageContainer");
3838

39-
var eventBus = new pdfjsViewer.EventBus();
39+
const eventBus = new pdfjsViewer.EventBus();
4040

4141
// Loading document.
42-
var loadingTask = pdfjsLib.getDocument({
42+
const loadingTask = pdfjsLib.getDocument({
4343
url: DEFAULT_URL,
4444
cMapUrl: CMAP_URL,
4545
cMapPacked: CMAP_PACKED,
@@ -48,7 +48,7 @@ loadingTask.promise.then(function (pdfDocument) {
4848
// Document loaded, retrieving the page.
4949
return pdfDocument.getPage(PAGE_TO_VIEW).then(function (pdfPage) {
5050
// Creating the page view with default parameters.
51-
var pdfPageView = new pdfjsViewer.PDFPageView({
51+
const pdfPageView = new pdfjsViewer.PDFPageView({
5252
container,
5353
id: PAGE_TO_VIEW,
5454
scale: SCALE,

‎examples/components/simpleviewer.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -27,40 +27,40 @@ pdfjsLib.GlobalWorkerOptions.workerSrc =
2727

2828
// Some PDFs need external cmaps.
2929
//
30-
var CMAP_URL = "../../node_modules/pdfjs-dist/cmaps/";
31-
var CMAP_PACKED = true;
30+
const CMAP_URL = "../../node_modules/pdfjs-dist/cmaps/";
31+
const CMAP_PACKED = true;
3232

33-
var DEFAULT_URL = "../../web/compressed.tracemonkey-pldi-09.pdf";
33+
const DEFAULT_URL = "../../web/compressed.tracemonkey-pldi-09.pdf";
3434
// To test the AcroForm and/or scripting functionality, try e.g. this file:
3535
// var DEFAULT_URL = "../../test/pdfs/160F-2019.pdf";
3636

37-
var SEARCH_FOR = ""; // try 'Mozilla';
37+
const SEARCH_FOR = ""; // try 'Mozilla';
3838

3939
// For scripting support, note also `enableScripting` below.
40-
var SANDBOX_BUNDLE_SRC = "../../node_modules/pdfjs-dist/build/pdf.sandbox.js";
40+
const SANDBOX_BUNDLE_SRC = "../../node_modules/pdfjs-dist/build/pdf.sandbox.js";
4141

42-
var container = document.getElementById("viewerContainer");
42+
const container = document.getElementById("viewerContainer");
4343

44-
var eventBus = new pdfjsViewer.EventBus();
44+
const eventBus = new pdfjsViewer.EventBus();
4545

4646
// (Optionally) enable hyperlinks within PDF files.
47-
var pdfLinkService = new pdfjsViewer.PDFLinkService({
47+
const pdfLinkService = new pdfjsViewer.PDFLinkService({
4848
eventBus,
4949
});
5050

5151
// (Optionally) enable find controller.
52-
var pdfFindController = new pdfjsViewer.PDFFindController({
52+
const pdfFindController = new pdfjsViewer.PDFFindController({
5353
eventBus,
5454
linkService: pdfLinkService,
5555
});
5656

5757
// (Optionally) enable scripting support.
58-
var pdfScriptingManager = new pdfjsViewer.PDFScriptingManager({
58+
const pdfScriptingManager = new pdfjsViewer.PDFScriptingManager({
5959
eventBus,
6060
sandboxBundleSrc: SANDBOX_BUNDLE_SRC,
6161
});
6262

63-
var pdfViewer = new pdfjsViewer.PDFViewer({
63+
const pdfViewer = new pdfjsViewer.PDFViewer({
6464
container,
6565
eventBus,
6666
linkService: pdfLinkService,
@@ -82,7 +82,7 @@ eventBus.on("pagesinit", function () {
8282
});
8383

8484
// Loading document.
85-
var loadingTask = pdfjsLib.getDocument({
85+
const loadingTask = pdfjsLib.getDocument({
8686
url: DEFAULT_URL,
8787
cMapUrl: CMAP_URL,
8888
cMapPacked: CMAP_PACKED,

‎examples/components/singlepageviewer.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -27,40 +27,40 @@ pdfjsLib.GlobalWorkerOptions.workerSrc =
2727

2828
// Some PDFs need external cmaps.
2929
//
30-
var CMAP_URL = "../../node_modules/pdfjs-dist/cmaps/";
31-
var CMAP_PACKED = true;
30+
const CMAP_URL = "../../node_modules/pdfjs-dist/cmaps/";
31+
const CMAP_PACKED = true;
3232

33-
var DEFAULT_URL = "../../web/compressed.tracemonkey-pldi-09.pdf";
33+
const DEFAULT_URL = "../../web/compressed.tracemonkey-pldi-09.pdf";
3434
// To test the AcroForm and/or scripting functionality, try e.g. this file:
3535
// var DEFAULT_URL = "../../test/pdfs/160F-2019.pdf";
3636

37-
var SEARCH_FOR = ""; // try 'Mozilla';
37+
const SEARCH_FOR = ""; // try 'Mozilla';
3838

3939
// For scripting support, note also `enableScripting` below.
40-
var SANDBOX_BUNDLE_SRC = "../../node_modules/pdfjs-dist/build/pdf.sandbox.js";
40+
const SANDBOX_BUNDLE_SRC = "../../node_modules/pdfjs-dist/build/pdf.sandbox.js";
4141

42-
var container = document.getElementById("viewerContainer");
42+
const container = document.getElementById("viewerContainer");
4343

44-
var eventBus = new pdfjsViewer.EventBus();
44+
const eventBus = new pdfjsViewer.EventBus();
4545

4646
// (Optionally) enable hyperlinks within PDF files.
47-
var pdfLinkService = new pdfjsViewer.PDFLinkService({
47+
const pdfLinkService = new pdfjsViewer.PDFLinkService({
4848
eventBus,
4949
});
5050

5151
// (Optionally) enable find controller.
52-
var pdfFindController = new pdfjsViewer.PDFFindController({
52+
const pdfFindController = new pdfjsViewer.PDFFindController({
5353
eventBus,
5454
linkService: pdfLinkService,
5555
});
5656

5757
// (Optionally) enable scripting support.
58-
var pdfScriptingManager = new pdfjsViewer.PDFScriptingManager({
58+
const pdfScriptingManager = new pdfjsViewer.PDFScriptingManager({
5959
eventBus,
6060
sandboxBundleSrc: SANDBOX_BUNDLE_SRC,
6161
});
6262

63-
var pdfSinglePageViewer = new pdfjsViewer.PDFSinglePageViewer({
63+
const pdfSinglePageViewer = new pdfjsViewer.PDFSinglePageViewer({
6464
container,
6565
eventBus,
6666
linkService: pdfLinkService,
@@ -82,7 +82,7 @@ eventBus.on("pagesinit", function () {
8282
});
8383

8484
// Loading document.
85-
var loadingTask = pdfjsLib.getDocument({
85+
const loadingTask = pdfjsLib.getDocument({
8686
url: DEFAULT_URL,
8787
cMapUrl: CMAP_URL,
8888
cMapPacked: CMAP_PACKED,

‎examples/image_decoders/jpeg_viewer.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ if (!pdfjsImageDecoders.JpegImage) {
2020
alert("Please build the pdfjs-dist library using `gulp dist-install`");
2121
}
2222

23-
var JPEG_IMAGE = "fish.jpg";
23+
const JPEG_IMAGE = "fish.jpg";
2424

25-
var jpegCanvas = document.getElementById("jpegCanvas");
26-
var jpegCtx = jpegCanvas.getContext("2d");
25+
const jpegCanvas = document.getElementById("jpegCanvas");
26+
const jpegCtx = jpegCanvas.getContext("2d");
2727

2828
// Load the image data, and convert it to a Uint8Array.
2929
//
30-
var nonBinaryRequest = false;
31-
var request = new XMLHttpRequest();
30+
let nonBinaryRequest = false;
31+
const request = new XMLHttpRequest();
3232
request.open("GET", JPEG_IMAGE, false);
3333
try {
3434
request.responseType = "arraybuffer";
@@ -41,12 +41,12 @@ if (nonBinaryRequest && request.overrideMimeType) {
4141
}
4242
request.send(null);
4343

44-
var typedArrayImage;
44+
let typedArrayImage;
4545
if (nonBinaryRequest) {
46-
var str = request.responseText,
46+
const str = request.responseText,
4747
length = str.length;
48-
var bytes = new Uint8Array(length);
49-
for (var i = 0; i < length; ++i) {
48+
const bytes = new Uint8Array(length);
49+
for (let i = 0; i < length; ++i) {
5050
bytes[i] = str.charCodeAt(i) & 0xff;
5151
}
5252
typedArrayImage = bytes;
@@ -56,22 +56,22 @@ if (nonBinaryRequest) {
5656

5757
// Parse the image data using `JpegImage`.
5858
//
59-
var jpegImage = new pdfjsImageDecoders.JpegImage();
59+
const jpegImage = new pdfjsImageDecoders.JpegImage();
6060
jpegImage.parse(typedArrayImage);
6161

62-
var width = jpegImage.width,
62+
const width = jpegImage.width,
6363
height = jpegImage.height;
64-
var jpegData = jpegImage.getData({
64+
const jpegData = jpegImage.getData({
6565
width,
6666
height,
6767
forceRGB: true,
6868
});
6969

7070
// Render the JPEG image on a <canvas>.
7171
//
72-
var imageData = jpegCtx.createImageData(width, height);
73-
var imageBytes = imageData.data;
74-
for (var j = 0, k = 0, jj = width * height * 4; j < jj; ) {
72+
const imageData = jpegCtx.createImageData(width, height);
73+
const imageBytes = imageData.data;
74+
for (let j = 0, k = 0, jj = width * height * 4; j < jj; ) {
7575
imageBytes[j++] = jpegData[k++];
7676
imageBytes[j++] = jpegData[k++];
7777
imageBytes[j++] = jpegData[k++];

0 commit comments

Comments
 (0)