Fix inconsistent spacing and trailing commas in objects in web/ files, so we can enable the comma-dangle and object-curly-spacing ESLint rules later on

http://eslint.org/docs/rules/comma-dangle
http://eslint.org/docs/rules/object-curly-spacing

Given that we currently have quite inconsistent object formatting, fixing this in in *one* big patch probably wouldn't be feasible (since I cannot imagine anyone wanting to review that); hence I've opted to try and do this piecewise instead.

*Please note:* This patch was created automatically, using the ESLint `--fix` command line option. In a couple of places this caused lines to become too long, and I've fixed those manually; please refer to the interdiff below for the only hand-edits in this patch.

```diff
diff --git a/web/pdf_thumbnail_view.js b/web/pdf_thumbnail_view.js
index 002dbf29..1de4e53 100644
--- a/web/pdf_thumbnail_view.js
+++ b/web/pdf_thumbnail_view.js
@@ -420,8 +420,8 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
     setPageLabel: function PDFThumbnailView_setPageLabel(label) {
       this.pageLabel = (typeof label === 'string' ? label : null);

-      this.l10n.get('thumb_page_title', { page: this.pageId, }, 'Page {{page}}').
-          then((msg) => {
+      this.l10n.get('thumb_page_title', { page: this.pageId, },
+                    'Page {{page}}').then((msg) => {
         this.anchor.title = msg;
       });

diff --git a/web/secondary_toolbar.js b/web/secondary_toolbar.js
index 160e0410..6495fc5 100644
--- a/web/secondary_toolbar.js
+++ b/web/secondary_toolbar.js
@@ -65,7 +65,8 @@ class SecondaryToolbar {
       { element: options.printButton, eventName: 'print', close: true, },
       { element: options.downloadButton, eventName: 'download', close: true, },
       { element: options.viewBookmarkButton, eventName: null, close: true, },
-      { element: options.firstPageButton, eventName: 'firstpage', close: true, },
+      { element: options.firstPageButton, eventName: 'firstpage',
+        close: true, },
       { element: options.lastPageButton, eventName: 'lastpage', close: true, },
       { element: options.pageRotateCwButton, eventName: 'rotatecw',
         close: false, },
@@ -76,7 +77,7 @@ class SecondaryToolbar {
       { element: options.cursorHandToolButton, eventName: 'switchcursortool',
         eventDetails: { tool: CursorTool.HAND, }, close: true, },
       { element: options.documentPropertiesButton,
-        eventName: 'documentproperties', close: true, }
+        eventName: 'documentproperties', close: true, },
     ];
     this.items = {
       firstPage: options.firstPageButton,
```

Author: Snuffleupagus

web/annotation_layer_builder.js

@@ -49,7 +49,7 @@ class AnnotationLayerBuilder {
   render(viewport, intent = 'display') {
     this.pdfPage.getAnnotations({ intent, }).then((annotations) => {
       var parameters = {
-        viewport: viewport.clone({ dontFlip: true }),
+        viewport: viewport.clone({ dontFlip: true, }),
         div: this.div,
         annotations,
         page: this.pdfPage,

web/app.js

@@ -22,7 +22,7 @@ import {
 import {
   build, createBlob, getDocument, getFilenameFromUrl, InvalidPDFException,
   MissingPDFException, OPS, PDFJS, shadow, UnexpectedResponseException,
-  UNSUPPORTED_FEATURES, version,
+  UNSUPPORTED_FEATURES, version
 } from 'pdfjs-lib';
 import { CursorTool, PDFCursorTools } from './pdf_cursor_tools';
 import { PDFRenderingQueue, RenderingStates } from './pdf_rendering_queue';
@@ -329,7 +329,7 @@ var PDFViewerApplication = {
         container: thumbnailContainer,
         renderingQueue: pdfRenderingQueue,
         linkService: pdfLinkService,
-        l10n: this.l10n
+        l10n: this.l10n,
       });
       pdfRenderingQueue.setThumbnailViewer(this.pdfThumbnailViewer);
 
@@ -389,7 +389,7 @@ var PDFViewerApplication = {
           viewer,
           pdfViewer: this.pdfViewer,
           eventBus,
-          contextMenuItems: appConfig.fullscreen
+          contextMenuItems: appConfig.fullscreen,
         });
       }
 
@@ -543,7 +543,7 @@ var PDFViewerApplication = {
         },
         onProgress(loaded, total) {
           PDFViewerApplication.progress(loaded / total);
-        }
+        },
       });
     } else {
       throw new Error('Not implemented: initPassiveLoading');
@@ -779,25 +779,25 @@ var PDFViewerApplication = {
    */
   error: function pdfViewError(message, moreInfo) {
     let moreInfoText = [this.l10n.get('error_version_info',
-      {version: version || '?', build: build || '?'},
+      { version: version || '?', build: build || '?', },
       'PDF.js v{{version}} (build: {{build}})')];
     if (moreInfo) {
       moreInfoText.push(
-        this.l10n.get('error_message', {message: moreInfo.message},
+        this.l10n.get('error_message', { message: moreInfo.message, },
                       'Message: {{message}}'));
       if (moreInfo.stack) {
         moreInfoText.push(
-          this.l10n.get('error_stack', {stack: moreInfo.stack},
+          this.l10n.get('error_stack', { stack: moreInfo.stack, },
                         'Stack: {{stack}}'));
       } else {
         if (moreInfo.filename) {
           moreInfoText.push(
-            this.l10n.get('error_file', {file: moreInfo.filename},
+            this.l10n.get('error_file', { file: moreInfo.filename, },
                           'File: {{file}}'));
         }
         if (moreInfo.lineNumber) {
           moreInfoText.push(
-            this.l10n.get('error_line', {line: moreInfo.lineNumber},
+            this.l10n.get('error_line', { line: moreInfo.lineNumber, },
                           'Line: {{line}}'));
         }
       }
@@ -1133,7 +1133,7 @@ var PDFViewerApplication = {
       this.initialDestination = null;
     } else if (this.initialBookmark) {
       this.pdfLinkService.setHash(this.initialBookmark);
-      this.pdfHistory.push({ hash: this.initialBookmark }, true);
+      this.pdfHistory.push({ hash: this.initialBookmark, }, true);
       this.initialBookmark = null;
     } else if (storedHash) {
       this.pdfLinkService.setHash(storedHash);
@@ -1215,7 +1215,7 @@ var PDFViewerApplication = {
     if (typeof PDFJSDev !== 'undefined' &&
         PDFJSDev.test('FIREFOX || MOZCENTRAL')) {
       this.externalServices.reportTelemetry({
-        type: 'print'
+        type: 'print',
       });
     }
   },
@@ -1608,7 +1608,7 @@ function webViewerPageRendered(e) {
   if (typeof PDFJSDev !== 'undefined' &&
       PDFJSDev.test('FIREFOX || MOZCENTRAL')) {
     PDFViewerApplication.externalServices.reportTelemetry({
-      type: 'pageInfo'
+      type: 'pageInfo',
     });
     // It is a good time to report stream and font types.
     PDFViewerApplication.pdfDocument.getStats().then(function (stats) {
@@ -1851,7 +1851,7 @@ function webViewerFind(e) {
     phraseSearch: e.phraseSearch,
     caseSensitive: e.caseSensitive,
     highlightAll: e.highlightAll,
-    findPrevious: e.findPrevious
+    findPrevious: e.findPrevious,
   });
 }
 
@@ -1861,7 +1861,7 @@ function webViewerFindFromUrlHash(e) {
     phraseSearch: e.phraseSearch,
     caseSensitive: false,
     highlightAll: true,
-    findPrevious: false
+    findPrevious: false,
   });
 }
 
@@ -1989,7 +1989,7 @@ function webViewerKeyDown(evt) {
               phraseSearch: findState.phraseSearch,
               caseSensitive: findState.caseSensitive,
               highlightAll: findState.highlightAll,
-              findPrevious: cmd === 5 || cmd === 12
+              findPrevious: cmd === 5 || cmd === 12,
             });
           }
           handled = true;
@@ -2241,8 +2241,8 @@ var PDFPrintServiceFactory = {
     supportsPrinting: false,
     createPrintService() {
       throw new Error('Not implemented: createPrintService');
-    }
-  }
+    },
+  },
 };
 
 export {

web/chromecom.js

@@ -208,7 +208,7 @@ function requestAccessToLocalFile(fileUrl, overlayManager) {
       // checkbox causes the extension to reload, and Chrome will close all
       // tabs upon reload.
       ChromeCom.request('openExtensionsPageForFileAccess', {
-        newTab: e.ctrlKey || e.metaKey || e.button === 1 || window !== top
+        newTab: e.ctrlKey || e.metaKey || e.button === 1 || window !== top,
       });
     };
 
@@ -254,14 +254,14 @@ function setReferer(url, callback) {
   if (!port) {
     // The background page will accept the port, and keep adding the Referer
     // request header to requests to |url| until the port is disconnected.
-    port = chrome.runtime.connect({name: 'chromecom-referrer'});
+    port = chrome.runtime.connect({ name: 'chromecom-referrer', });
   }
   port.onDisconnect.addListener(onDisconnect);
   port.onMessage.addListener(onMessage);
   // Initiate the information exchange.
   port.postMessage({
     referer: window.history.state && window.history.state.chromecomState,
-    requestUrl: url
+    requestUrl: url,
   });
 
   function onMessage(referer) {

web/debugger.js

@@ -119,7 +119,7 @@ var FontInspector = (function FontInspectorClosure() {
         download.href = url[1];
       } else if (fontObj.data) {
         url = URL.createObjectURL(new Blob([fontObj.data], {
-          type: fontObj.mimeType
+          type: fontObj.mimeType,
         }));
         download.href = url;
       }
@@ -154,7 +154,7 @@ var FontInspector = (function FontInspectorClosure() {
           resetSelection();
         }
       }, 2000);
-    }
+    },
   };
 })();
 
@@ -243,7 +243,7 @@ var StepperManager = (function StepperManagerClosure() {
     saveBreakPoints: function saveBreakPoints(pageIndex, bps) {
       breakPoints[pageIndex] = bps;
       sessionStorage.setItem('pdfjsBreakPoints', JSON.stringify(breakPoints));
-    }
+    },
   };
 })();
 
@@ -433,7 +433,7 @@ var Stepper = (function StepperClosure() {
           row.style.backgroundColor = null;
         }
       }
-    }
+    },
   };
   return Stepper;
 })();
@@ -497,7 +497,7 @@ var Stats = (function Stats() {
     cleanup() {
       stats = [];
       clear(this.panel);
-    }
+    },
   };
 })();
 
@@ -615,6 +615,6 @@ window.PDFBug = (function PDFBugClosure() {
           tools[j].panel.setAttribute('hidden', 'true');
         }
       }
-    }
+    },
   };
 })();

web/dom_events.js

@@ -34,7 +34,7 @@ function attachDOMEventsToEventBus(eventBus) {
   eventBus.on('textlayerrendered', function (e) {
     var event = document.createEvent('CustomEvent');
     event.initCustomEvent('textlayerrendered', true, true, {
-      pageNumber: e.pageNumber
+      pageNumber: e.pageNumber,
     });
     e.source.textLayerDiv.dispatchEvent(event);
   });
@@ -52,7 +52,7 @@ function attachDOMEventsToEventBus(eventBus) {
   eventBus.on('pagesloaded', function (e) {
     var event = document.createEvent('CustomEvent');
     event.initCustomEvent('pagesloaded', true, true, {
-      pagesCount: e.pagesCount
+      pagesCount: e.pagesCount,
     });
     e.source.container.dispatchEvent(event);
   });
@@ -79,14 +79,14 @@ function attachDOMEventsToEventBus(eventBus) {
       phraseSearch: e.phraseSearch,
       caseSensitive: e.caseSensitive,
       highlightAll: e.highlightAll,
-      findPrevious: e.findPrevious
+      findPrevious: e.findPrevious,
     });
     window.dispatchEvent(event);
   });
   eventBus.on('attachmentsloaded', function (e) {
     var event = document.createEvent('CustomEvent');
     event.initCustomEvent('attachmentsloaded', true, true, {
-      attachmentsCount: e.attachmentsCount
+      attachmentsCount: e.attachmentsCount,
     });
     e.source.container.dispatchEvent(event);
   });
@@ -107,22 +107,22 @@ function attachDOMEventsToEventBus(eventBus) {
   eventBus.on('namedaction', function (e) {
     var event = document.createEvent('CustomEvent');
     event.initCustomEvent('namedaction', true, true, {
-      action: e.action
+      action: e.action,
     });
     e.source.pdfViewer.container.dispatchEvent(event);
   });
   eventBus.on('presentationmodechanged', function (e) {
     var event = document.createEvent('CustomEvent');
     event.initCustomEvent('presentationmodechanged', true, true, {
       active: e.active,
-      switchInProgress: e.switchInProgress
+      switchInProgress: e.switchInProgress,
     });
     window.dispatchEvent(event);
   });
   eventBus.on('outlineloaded', function (e) {
     var event = document.createEvent('CustomEvent');
     event.initCustomEvent('outlineloaded', true, true, {
-      outlineCount: e.outlineCount
+      outlineCount: e.outlineCount,
     });
     e.source.container.dispatchEvent(event);
   });

web/download_manager.js

@@ -69,7 +69,7 @@ DownloadManager.prototype = {
   downloadData: function DownloadManager_downloadData(data, filename,
                                                       contentType) {
     if (navigator.msSaveBlob) { // IE10 and above
-      return navigator.msSaveBlob(new Blob([data], { type: contentType }),
+      return navigator.msSaveBlob(new Blob([data], { type: contentType, }),
                                   filename);
     }
 
@@ -95,7 +95,7 @@ DownloadManager.prototype = {
 
     var blobUrl = URL.createObjectURL(blob);
     download(blobUrl, filename);
-  }
+  },
 };
 
 export {

web/firefox_print_service.js

@@ -49,7 +49,7 @@ function composePage(pdfDocument, pageNumber, size, printContainer) {
         canvasContext: ctx,
         transform: [PRINT_UNITS, 0, 0, PRINT_UNITS, 0, 0],
         viewport: pdfPage.getViewport(1, size.rotation),
-        intent: 'print'
+        intent: 'print',
       };
       return pdfPage.render(renderContext).promise;
     }).then(function() {
@@ -88,7 +88,7 @@ FirefoxPrintService.prototype = {
 
   destroy() {
     this.printContainer.textContent = '';
-  }
+  },
 };
 
 PDFPrintServiceFactory.instance = {
@@ -101,7 +101,7 @@ PDFPrintServiceFactory.instance = {
 
   createPrintService(pdfDocument, pagesOverview, printContainer) {
     return new FirefoxPrintService(pdfDocument, pagesOverview, printContainer);
-  }
+  },
 };
 
 export {

web/firefoxcom.js

@@ -75,10 +75,10 @@ var FirefoxCom = (function FirefoxComClosure() {
         action,
         data,
         sync: false,
-        responseExpected: !!callback
+        responseExpected: !!callback,
       });
       return request.dispatchEvent(sender);
-    }
+    },
   };
 })();
 
@@ -101,7 +101,7 @@ var DownloadManager = (function DownloadManagerClosure() {
         blobUrl,
         originalUrl: blobUrl,
         filename,
-        isAttachment: true
+        isAttachment: true,
       });
     },
 
@@ -119,7 +119,7 @@ var DownloadManager = (function DownloadManagerClosure() {
         originalUrl: url,
         filename,
       }, onResponse);
-    }
+    },
   };
 
   return DownloadManager;
@@ -179,7 +179,7 @@ class MozL10n {
       phraseSearch: true,
       caseSensitive: !!evt.detail.caseSensitive,
       highlightAll: !!evt.detail.highlightAll,
-      findPrevious: !!evt.detail.findPrevious
+      findPrevious: !!evt.detail.findPrevious,
     });
   };
 
@@ -305,7 +305,7 @@ document.mozL10n.setExternalLocalizerServices({
 
   getStrings(key) {
     return FirefoxCom.requestSync('getStrings', key);
-  }
+  },
 });
 
 export {

web/grab_to_pan.js

@@ -175,7 +175,7 @@ GrabToPan.prototype = {
     this.document.removeEventListener('mouseup', this._endPan, true);
     // Note: ChildNode.remove doesn't throw if the parentNode is undefined.
     this.overlay.remove();
-  }
+  },
 };
 
 // Get the correct (vendor-prefixed) name of the matches method.