diff --git a/.eslintrc b/.eslintrc index 1e1aff530..cad57471c 100644 --- a/.eslintrc +++ b/.eslintrc @@ -136,6 +136,7 @@ "new-cap": ["error", { "newIsCap": true, "capIsNew": false, }], "no-array-constructor": "error", "no-multiple-empty-lines": ["error", { "max": 1, "maxEOF": 0, "maxBOF": 1, }], + "no-nested-ternary": "off", "no-new-object": "error", "spaced-comment": ["error", "always", { "block": { diff --git a/web/.eslintrc b/web/.eslintrc index 3fe119c0d..c3b8f89b6 100644 --- a/web/.eslintrc +++ b/web/.eslintrc @@ -7,6 +7,9 @@ // Plugins "import/no-unresolved": ["error", { "ignore": ["pdfjs-lib"]}], + // Stylistic Issues + "no-nested-ternary": "error", + // ECMAScript 6 "no-var": "error", "prefer-const": "error", diff --git a/web/app.js b/web/app.js index 13a659feb..68c37d5bf 100644 --- a/web/app.js +++ b/web/app.js @@ -1375,11 +1375,10 @@ const PDFViewerApplication = { }); } - const formType = !info.IsAcroFormPresent - ? null - : info.IsXFAPresent - ? "xfa" - : "acroform"; + let formType = null; + if (info.IsAcroFormPresent) { + formType = info.IsXFAPresent ? "xfa" : "acroform"; + } this.externalServices.reportTelemetry({ type: "documentInfo", version: versionId, @@ -2066,13 +2065,14 @@ function webViewerNamedAction(evt) { } } -function webViewerPresentationModeChanged(evt) { - const { active, switchInProgress } = evt; - PDFViewerApplication.pdfViewer.presentationModeState = switchInProgress - ? PresentationModeState.CHANGING - : active - ? PresentationModeState.FULLSCREEN - : PresentationModeState.NORMAL; +function webViewerPresentationModeChanged({ active, switchInProgress }) { + let state = PresentationModeState.NORMAL; + if (switchInProgress) { + state = PresentationModeState.CHANGING; + } else if (active) { + state = PresentationModeState.FULLSCREEN; + } + PDFViewerApplication.pdfViewer.presentationModeState = state; } function webViewerSidebarViewChanged(evt) {