Skip to content

Commit c1125ca

Browse files
Snuffleupagusphuocng
authored andcommitted
Enable ESLint rules that no longer need to be disabled on a directory/file-basis
Given that browsers/environments without native support for both arrow functions and object shorthand properties are no longer supported in PDF.js, please refer to the compatibility information below, we can now enable a fair number of ESLint rules and also simplify/remove some `.eslintrc` files. With the exception of the `no-alert` cases, all code changes were made automatically by using `gulp lint --fix`. - https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions#browser_compatibility - https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Object_initializer#browser_compatibility
1 parent dc8ab62 commit c1125ca

File tree

25 files changed

+76
-110
lines changed

25 files changed

+76
-110
lines changed

examples/.eslintrc

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,9 @@
33
"../.eslintrc"
44
],
55

6-
"parserOptions": {
7-
"ecmaVersion": 6,
8-
},
9-
10-
"env": {
11-
"es6": false,
12-
},
13-
146
"globals": {
157
"pdfjsImageDecoders": false,
168
"pdfjsLib": false,
179
"pdfjsViewer": false,
18-
"Uint8Array": false,
1910
},
20-
21-
"rules": {
22-
"no-alert": "off",
23-
"object-shorthand": ["error", "never"]
24-
}
2511
}

examples/acroforms/acroforms.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ loadingTask.promise.then(function (doc) {
3737
return doc.getPage(pageNum).then(function (pdfPage) {
3838
// Create the page view.
3939
var pdfPageView = new pdfjsViewer.PDFPageView({
40-
container: container,
40+
container,
4141
id: pageNum,
4242
scale: DEFAULT_SCALE,
4343
defaultViewport: pdfPage.getViewport({ scale: DEFAULT_SCALE }),
44-
eventBus: eventBus,
44+
eventBus,
4545
annotationLayerFactory: new pdfjsViewer.DefaultAnnotationLayerFactory(),
4646
renderInteractiveForms: true,
4747
});

examples/browserify/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ loadingTask.promise
2525
var ctx = canvas.getContext("2d");
2626
var renderTask = pdfPage.render({
2727
canvasContext: ctx,
28-
viewport: viewport,
28+
viewport,
2929
});
3030
return renderTask.promise;
3131
});

examples/components/pageviewer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"use strict";
1717

1818
if (!pdfjsLib.getDocument || !pdfjsViewer.PDFPageView) {
19+
// eslint-disable-next-line no-alert
1920
alert("Please build the pdfjs-dist library using\n `gulp dist-install`");
2021
}
2122

@@ -48,11 +49,11 @@ loadingTask.promise.then(function (pdfDocument) {
4849
return pdfDocument.getPage(PAGE_TO_VIEW).then(function (pdfPage) {
4950
// Creating the page view with default parameters.
5051
var pdfPageView = new pdfjsViewer.PDFPageView({
51-
container: container,
52+
container,
5253
id: PAGE_TO_VIEW,
5354
scale: SCALE,
5455
defaultViewport: pdfPage.getViewport({ scale: SCALE }),
55-
eventBus: eventBus,
56+
eventBus,
5657
// We can enable text/annotations layers, if needed
5758
textLayerFactory: new pdfjsViewer.DefaultTextLayerFactory(),
5859
annotationLayerFactory: new pdfjsViewer.DefaultAnnotationLayerFactory(),

examples/components/simpleviewer.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"use strict";
1717

1818
if (!pdfjsLib.getDocument || !pdfjsViewer.PDFViewer) {
19+
// eslint-disable-next-line no-alert
1920
alert("Please build the pdfjs-dist library using\n `gulp dist-install`");
2021
}
2122

@@ -38,18 +39,18 @@ var eventBus = new pdfjsViewer.EventBus();
3839

3940
// (Optionally) enable hyperlinks within PDF files.
4041
var pdfLinkService = new pdfjsViewer.PDFLinkService({
41-
eventBus: eventBus,
42+
eventBus,
4243
});
4344

4445
// (Optionally) enable find controller.
4546
var pdfFindController = new pdfjsViewer.PDFFindController({
46-
eventBus: eventBus,
47+
eventBus,
4748
linkService: pdfLinkService,
4849
});
4950

5051
var pdfViewer = new pdfjsViewer.PDFViewer({
51-
container: container,
52-
eventBus: eventBus,
52+
container,
53+
eventBus,
5354
linkService: pdfLinkService,
5455
findController: pdfFindController,
5556
});

examples/components/singlepageviewer.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"use strict";
1717

1818
if (!pdfjsLib.getDocument || !pdfjsViewer.PDFSinglePageViewer) {
19+
// eslint-disable-next-line no-alert
1920
alert("Please build the pdfjs-dist library using\n `gulp dist-install`");
2021
}
2122

@@ -38,18 +39,18 @@ var eventBus = new pdfjsViewer.EventBus();
3839

3940
// (Optionally) enable hyperlinks within PDF files.
4041
var pdfLinkService = new pdfjsViewer.PDFLinkService({
41-
eventBus: eventBus,
42+
eventBus,
4243
});
4344

4445
// (Optionally) enable find controller.
4546
var pdfFindController = new pdfjsViewer.PDFFindController({
46-
eventBus: eventBus,
47+
eventBus,
4748
linkService: pdfLinkService,
4849
});
4950

5051
var pdfSinglePageViewer = new pdfjsViewer.PDFSinglePageViewer({
51-
container: container,
52-
eventBus: eventBus,
52+
container,
53+
eventBus,
5354
linkService: pdfLinkService,
5455
findController: pdfFindController,
5556
});

examples/image_decoders/jpeg_viewer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"use strict";
1717

1818
if (!pdfjsImageDecoders.JpegImage) {
19+
// eslint-disable-next-line no-alert
1920
alert("Please build the pdfjs-dist library using `gulp dist-install`");
2021
}
2122

@@ -61,8 +62,8 @@ jpegImage.parse(typedArrayImage);
6162
var width = jpegImage.width,
6263
height = jpegImage.height;
6364
var jpegData = jpegImage.getData({
64-
width: width,
65-
height: height,
65+
width,
66+
height,
6667
forceRGB: true,
6768
});
6869

examples/mobile-viewer/viewer.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"use strict";
1717

1818
if (!pdfjsLib.getDocument || !pdfjsViewer.PDFViewer) {
19+
// eslint-disable-next-line no-alert
1920
alert("Please build the pdfjs-dist library using\n `gulp dist-install`");
2021
}
2122

@@ -47,7 +48,7 @@ var PDFViewerApplication = {
4748
* @returns {Promise} - Returns the promise, which is resolved when document
4849
* is opened.
4950
*/
50-
open: function (params) {
51+
open(params) {
5152
if (this.pdfLoadingTask) {
5253
// We need to destroy already opened document
5354
return this.close().then(
@@ -64,7 +65,7 @@ var PDFViewerApplication = {
6465

6566
// Loading document.
6667
var loadingTask = pdfjsLib.getDocument({
67-
url: url,
68+
url,
6869
maxImageSize: MAX_IMAGE_SIZE,
6970
cMapUrl: CMAP_URL,
7071
cMapPacked: CMAP_PACKED,
@@ -120,7 +121,7 @@ var PDFViewerApplication = {
120121
}
121122

122123
loadingErrorMessage.then(function (msg) {
123-
self.error(msg, { message: message });
124+
self.error(msg, { message });
124125
});
125126
self.loadingBar.hide();
126127
}
@@ -132,7 +133,7 @@ var PDFViewerApplication = {
132133
* @returns {Promise} - Returns the promise, which is resolved when all
133134
* destruction is completed.
134135
*/
135-
close: function () {
136+
close() {
136137
var errorWrapper = document.getElementById("errorWrapper");
137138
errorWrapper.setAttribute("hidden", "true");
138139

@@ -175,7 +176,7 @@ var PDFViewerApplication = {
175176
this.setTitle(title);
176177
},
177178

178-
setTitleUsingMetadata: function (pdfDocument) {
179+
setTitleUsingMetadata(pdfDocument) {
179180
var self = this;
180181
pdfDocument.getMetadata().then(function (data) {
181182
var info = data.info,
@@ -345,17 +346,17 @@ var PDFViewerApplication = {
345346
this.eventBus = eventBus;
346347

347348
var linkService = new pdfjsViewer.PDFLinkService({
348-
eventBus: eventBus,
349+
eventBus,
349350
});
350351
this.pdfLinkService = linkService;
351352

352353
this.l10n = pdfjsViewer.NullL10n;
353354

354355
var container = document.getElementById("viewerContainer");
355356
var pdfViewer = new pdfjsViewer.PDFViewer({
356-
container: container,
357-
eventBus: eventBus,
358-
linkService: linkService,
357+
container,
358+
eventBus,
359+
linkService,
359360
l10n: this.l10n,
360361
useOnlyCssZoom: USE_ONLY_CSS_ZOOM,
361362
textLayerMode: TEXT_LAYER_MODE,
@@ -364,8 +365,8 @@ var PDFViewerApplication = {
364365
linkService.setViewer(pdfViewer);
365366

366367
this.pdfHistory = new pdfjsViewer.PDFHistory({
367-
eventBus: eventBus,
368-
linkService: linkService,
368+
eventBus,
369+
linkService,
369370
});
370371
linkService.setHistory(this.pdfHistory);
371372

examples/node/domstubs.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function DOMElement(name) {
5858
if (name === "style") {
5959
this.sheet = {
6060
cssRules: [],
61-
insertRule: function (rule) {
61+
insertRule(rule) {
6262
this.cssRules.push(rule);
6363
},
6464
};
@@ -226,16 +226,16 @@ const document = {
226226
return this;
227227
},
228228

229-
createElementNS: function (NS, element) {
229+
createElementNS(NS, element) {
230230
var elObject = new DOMElement(element);
231231
return elObject;
232232
},
233233

234-
createElement: function (element) {
234+
createElement(element) {
235235
return this.createElementNS("", element);
236236
},
237237

238-
getElementsByTagName: function (element) {
238+
getElementsByTagName(element) {
239239
if (element === "head") {
240240
return [this.head || (this.head = new DOMElement("head"))];
241241
}

examples/node/pdf2png/pdf2png.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ NodeCanvasFactory.prototype = {
2424
var canvas = Canvas.createCanvas(width, height);
2525
var context = canvas.getContext("2d");
2626
return {
27-
canvas: canvas,
28-
context: context,
27+
canvas,
28+
context,
2929
};
3030
},
3131

@@ -61,7 +61,7 @@ var data = new Uint8Array(fs.readFileSync(pdfPath));
6161

6262
// Load the PDF file.
6363
var loadingTask = pdfjsLib.getDocument({
64-
data: data,
64+
data,
6565
cMapUrl: CMAP_URL,
6666
cMapPacked: CMAP_PACKED,
6767
});
@@ -80,8 +80,8 @@ loadingTask.promise
8080
);
8181
var renderContext = {
8282
canvasContext: canvasAndContext.context,
83-
viewport: viewport,
84-
canvasFactory: canvasFactory,
83+
viewport,
84+
canvasFactory,
8585
};
8686

8787
var renderTask = page.render(renderContext);

0 commit comments

Comments
 (0)