Enable the object-shorthand ESLint rule in src/display

Please see http://eslint.org/docs/rules/object-shorthand.

For the most part, these changes are of the search-and-replace kind, and the previously enabled `no-undef` rule should complement the tests in helping ensure that no stupid errors crept into to the patch.

src/display/annotation_layer.js

@@ -237,8 +237,8 @@ var AnnotationElement = (function AnnotationElementClosure() {
       }
 
       var popupElement = new PopupElement({
-        container: container,
+        container,
-        trigger: trigger,
+        trigger,
         color: data.color,
         title: data.title,
         contents: data.contents,
@@ -1154,7 +1154,7 @@ var AnnotationLayer = (function AnnotationLayerClosure() {
           continue;
         }
         var element = annotationElementFactory.create({
-          data: data,
+          data,
           layer: parameters.div,
           page: parameters.page,
           viewport: parameters.viewport,

src/display/api.js

@@ -284,8 +284,8 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
     source.initialData = pdfDataRangeTransport.initialData;
   }
   return worker.messageHandler.sendWithPromise('GetDocRequest', {
-    docId: docId,
+    docId,
-    source: source,
+    source,
     disableRange: getDefaultSetting('disableRange'),
     maxImageSize: getDefaultSetting('maxImageSize'),
     disableFontFace: getDefaultSetting('disableFontFace'),
@@ -364,7 +364,7 @@ var PDFDocumentLoadingTask = (function PDFDocumentLoadingTaskClosure() {
      * @return {Promise} A promise that is resolved after destruction activity
      *                   is completed.
      */
-    destroy: function () {
+    destroy() {
       this.destroyed = true;
 
       var transportDestroyed = !this._transport ? Promise.resolve() :
@@ -968,7 +968,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
     /**
      * Cleans up resources allocated by the page. (deprecated)
      */
-    destroy: function() {
+    destroy() {
       deprecated('page destroy method, use cleanup() instead');
       this.cleanup();
     },
@@ -1119,7 +1119,7 @@ var PDFWorker = (function PDFWorkerClosure() {
     this._deferred = Promise.resolve(undefined);
   }
   FakeWorkerPort.prototype = {
-    postMessage: function (obj, transfers) {
+    postMessage(obj, transfers) {
       function cloneValue(value) {
         // Trying to perform a structured clone close to the spec, including
         // transfers.
@@ -1179,14 +1179,14 @@ var PDFWorker = (function PDFWorkerClosure() {
         }, this);
       }.bind(this));
     },
-    addEventListener: function (name, listener) {
+    addEventListener(name, listener) {
       this._listeners.push(listener);
     },
-    removeEventListener: function (name, listener) {
+    removeEventListener(name, listener) {
       var i = this._listeners.indexOf(listener);
       this._listeners.splice(i, 1);
     },
-    terminate: function () {
+    terminate() {
       this._listeners = [];
     }
   };
@@ -1495,20 +1495,20 @@ var WorkerTransport = (function WorkerTransportClosure() {
       if (pdfDataRangeTransport) {
         pdfDataRangeTransport.addRangeListener(function(begin, chunk) {
           messageHandler.send('OnDataRange', {
-            begin: begin,
+            begin,
-            chunk: chunk
+            chunk,
           });
         });
 
         pdfDataRangeTransport.addProgressListener(function(loaded) {
           messageHandler.send('OnDataProgress', {
-            loaded: loaded
+            loaded,
           });
         });
 
         pdfDataRangeTransport.addProgressiveReadListener(function(chunk) {
           messageHandler.send('OnDataRange', {
-            chunk: chunk
+            chunk,
           });
         });
 
@@ -1532,12 +1532,11 @@ var WorkerTransport = (function WorkerTransportClosure() {
         this._passwordCapability = createPromiseCapability();
 
         if (loadingTask.onPassword) {
-          var updatePassword = function (password) {
+          var updatePassword = (password) => {
             this._passwordCapability.resolve({
-              password: password,
+              password,
             });
-          }.bind(this);
+          };
-
           loadingTask.onPassword(updatePassword, exception.code);
         } else {
           this._passwordCapability.reject(
@@ -1628,7 +1627,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
             if (getDefaultSetting('pdfBug') && globalScope.FontInspector &&
                 globalScope['FontInspector'].enabled) {
               fontRegistry = {
-                registerFont: function (font, url) {
+                registerFont(font, url) {
                   globalScope['FontInspector'].fontAdded(font, url);
                 }
               };
@@ -1636,7 +1635,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
             var font = new FontFaceObject(exportedData, {
               isEvalSuported: getDefaultSetting('isEvalSupported'),
               disableFontFace: getDefaultSetting('disableFontFace'),
-              fontRegistry: fontRegistry
+              fontRegistry,
             });
 
             this.fontLoader.bind(
@@ -1784,7 +1783,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
                 buf[j] = data[i];
               }
             }
-            resolve({ data: buf, width: width, height: height});
+            resolve({ data: buf, width, height, });
           };
           img.onerror = function () {
             reject(new Error('JpegDecode failed to load image'));
@@ -1817,7 +1816,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
         return this.pagePromises[pageIndex];
       }
       var promise = this.messageHandler.sendWithPromise('GetPage', {
-        pageIndex: pageIndex
+        pageIndex,
       }).then(function (pageInfo) {
         if (this.destroyed) {
           throw new Error('Transport destroyed');
@@ -1832,7 +1831,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
 
     getPageIndex: function WorkerTransport_getPageIndexByRef(ref) {
       return this.messageHandler.sendWithPromise('GetPageIndex', {
-        ref: ref,
+        ref,
       }).catch(function (reason) {
         return Promise.reject(new Error(reason));
       });
@@ -1840,8 +1839,8 @@ var WorkerTransport = (function WorkerTransportClosure() {
 
     getAnnotations: function WorkerTransport_getAnnotations(pageIndex, intent) {
       return this.messageHandler.sendWithPromise('GetAnnotations', {
-        pageIndex: pageIndex,
+        pageIndex,
-        intent: intent,
+        intent,
       });
     },
 
@@ -1850,7 +1849,9 @@ var WorkerTransport = (function WorkerTransportClosure() {
     },
 
     getDestination: function WorkerTransport_getDestination(id) {
-      return this.messageHandler.sendWithPromise('GetDestination', { id: id });
+      return this.messageHandler.sendWithPromise('GetDestination', {
+        id,
+      });
     },
 
     getPageLabels: function WorkerTransport_getPageLabels() {
@@ -2194,12 +2195,12 @@ var InternalRenderTask = (function InternalRenderTaskClosure() {
 var _UnsupportedManager = (function UnsupportedManagerClosure() {
   var listeners = [];
   return {
-    listen: function (cb) {
+    listen(cb) {
       deprecated('Global UnsupportedManager.listen is used: ' +
                  ' use PDFDocumentLoadingTask.onUnsupportedFeature instead');
       listeners.push(cb);
     },
-    notify: function (featureId) {
+    notify(featureId) {
       for (var i = 0, ii = listeners.length; i < ii; i++) {
         listeners[i](featureId);
       }

src/display/canvas.js

@@ -182,7 +182,7 @@ var CachedCanvases = (function CachedCanvasesClosure() {
       }
       return canvasEntry;
     },
-    clear: function () {
+    clear() {
       for (var id in this.cache) {
         var canvasEntry = this.cache[id];
         this.canvasFactory.destroy(canvasEntry);
@@ -688,7 +688,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
     var backdrop = smask.backdrop || null;
     if (!smask.transferMap && WebGLUtils.isEnabled) {
       var composed = WebGLUtils.composeSMask(layerCtx.canvas, mask,
-        {subtype: smask.subtype, backdrop: backdrop});
+        { subtype: smask.subtype, backdrop, });
       ctx.setTransform(1, 0, 0, 1, 0, 0);
       ctx.drawImage(composed, smask.offsetX, smask.offsetY);
       return;
@@ -1376,10 +1376,10 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
         var paths = this.pendingTextPaths || (this.pendingTextPaths = []);
         paths.push({
           transform: ctx.mozCurrentTransform,
-          x: x,
+          x,
-          y: y,
+          y,
-          fontSize: fontSize,
+          fontSize,
-          addToPath: addToPath
+          addToPath,
         });
       }
     },
@@ -1630,11 +1630,10 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
         var color = IR[1];
         var baseTransform = this.baseTransform ||
                             this.ctx.mozCurrentTransform.slice();
-        var self = this;
         var canvasGraphicsFactory = {
-          createCanvasGraphics: function (ctx) {
+          createCanvasGraphics: (ctx) => {
-            return new CanvasGraphics(ctx, self.commonObjs, self.objs,
+            return new CanvasGraphics(ctx, this.commonObjs, this.objs,
-                                      self.canvasFactory);
+                                      this.canvasFactory);
           }
         };
         pattern = new TilingPattern(IR, color, this.ctx, canvasGraphicsFactory,
@@ -1812,10 +1811,10 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
         this.smaskStack.push({
           canvas: scratchCanvas.canvas,
           context: groupCtx,
-          offsetX: offsetX,
+          offsetX,
-          offsetY: offsetY,
+          offsetY,
-          scaleX: scaleX,
+          scaleX,
-          scaleY: scaleY,
+          scaleY,
           subtype: group.smask.subtype,
           backdrop: group.smask.backdrop,
           transferMap: group.smask.transferMap || null,
@@ -1915,7 +1914,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
         var currentTransform = ctx.mozCurrentTransformInverse;
         var position = this.getCanvasPosition(0, 0);
         this.imageLayer.appendImage({
-          objId: objId,
+          objId,
           left: position[0],
           top: position[1],
           width: w / currentTransform[0],
@@ -1936,7 +1935,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       if (COMPILE_TYPE3_GLYPHS && glyph && glyph.compiled === undefined) {
         if (width <= MAX_SIZE_TO_COMPILE && height <= MAX_SIZE_TO_COMPILE) {
           glyph.compiled =
-            compileType3Glyph({data: img.data, width: width, height: height});
+            compileType3Glyph({ data: img.data, width, height, });
         } else {
           glyph.compiled = null;
         }
@@ -2123,7 +2122,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       if (this.imageLayer) {
         var position = this.getCanvasPosition(0, -height);
         this.imageLayer.appendImage({
-          imgData: imgData,
+          imgData,
           left: position[0],
           top: position[1],
           width: width / currentTransform[0],
@@ -2153,7 +2152,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
         if (this.imageLayer) {
           var position = this.getCanvasPosition(entry.x, entry.y);
           this.imageLayer.appendImage({
-            imgData: imgData,
+            imgData,
             left: position[0],
             top: position[1],
             width: w,

src/display/dom_utils.js

@@ -29,8 +29,8 @@ DOMCanvasFactory.prototype = {
     canvas.width = width;
     canvas.height = height;
     return {
-      canvas: canvas,
+      canvas,
-      context: context,
+      context,
     };
   },
 
@@ -59,7 +59,7 @@ var DOMCMapReaderFactory = (function DOMCMapReaderFactoryClosure() {
   }
 
   DOMCMapReaderFactory.prototype = {
-    fetch: function(params) {
+    fetch(params) {
       var name = params.name;
       if (!name) {
         return Promise.reject(new Error('CMap name must be specified.'));

src/display/font_loader.js

@@ -87,7 +87,7 @@ if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('MOZCENTRAL')) {
       'ABAAAAAAAAAAAD6AAAAAAAAA==');
   };
   Object.defineProperty(FontLoader.prototype, 'loadTestFont', {
-    get: function () {
+    get() {
       return shadow(this, 'loadTestFont', getLoadTestFont());
     },
     configurable: true
@@ -170,7 +170,7 @@ if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('MOZCENTRAL')) {
     var request = {
       id: requestId,
       complete: LoadLoader_completeRequest,
-      callback: callback,
+      callback,
       started: Date.now()
     };
     context.requests.push(request);
@@ -320,7 +320,7 @@ if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('MOZCENTRAL || CHROME')) {
     return supported;
   };
   Object.defineProperty(FontLoader, 'isSyncFontLoadingSupported', {
-    get: function () {
+    get() {
       return shadow(FontLoader, 'isSyncFontLoadingSupported',
                     isSyncFontLoadingSupported());
     },

src/display/global.js

@@ -55,10 +55,10 @@ if (PDFJS.verbosity !== undefined) {
 }
 delete PDFJS.verbosity;
 Object.defineProperty(PDFJS, 'verbosity', {
-  get: function () {
+  get() {
     return getVerbosityLevel();
   },
-  set: function (level) {
+  set(level) {
     setVerbosityLevel(level);
   },
   enumerable: true,
@@ -250,10 +250,10 @@ if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('MOZCENTRAL')) {
   var savedOpenExternalLinksInNewWindow = PDFJS.openExternalLinksInNewWindow;
   delete PDFJS.openExternalLinksInNewWindow;
   Object.defineProperty(PDFJS, 'openExternalLinksInNewWindow', {
-    get: function () {
+    get() {
       return PDFJS.externalLinkTarget === LinkTarget.BLANK;
     },
-    set: function (value) {
+    set(value) {
       if (value) {
         deprecated('PDFJS.openExternalLinksInNewWindow, please use ' +
           '"PDFJS.externalLinkTarget = PDFJS.LinkTarget.BLANK" instead.');

src/display/pattern_helper.js

@@ -169,8 +169,8 @@ var createMeshCanvas = (function createMeshCanvasClosure() {
     var scaleY = boundsHeight / height;
 
     var context = {
-      coords: coords,
+      coords,
-      colors: colors,
+      colors,
       offsetX: -offsetX,
       offsetY: -offsetY,
       scaleX: 1 / scaleX,
@@ -212,10 +212,13 @@ var createMeshCanvas = (function createMeshCanvasClosure() {
       canvas = tmpCanvas.canvas;
     }
 
-    return {canvas: canvas,
+    return {
-            offsetX: offsetX - BORDER_SIZE * scaleX,
+      canvas,
-            offsetY: offsetY - BORDER_SIZE * scaleY,
+      offsetX: offsetX - BORDER_SIZE * scaleX,
-            scaleX: scaleX, scaleY: scaleY};
+      offsetY: offsetY - BORDER_SIZE * scaleY,
+      scaleX,
+      scaleY,
+    };
   }
   return createMeshCanvas;
 })();

src/display/text_layer.js

@@ -148,7 +148,7 @@ var renderTextLayer = (function renderTextLayerClosure() {
         bottom: b[3],
         div: textDiv,
         size: [divWidth, divHeight],
-        m: m
+        m,
       });
     }
   }

src/display/webgl.js

@@ -430,8 +430,8 @@ var WebGLUtils = (function WebGLUtilsClosure() {
       } catch (e) { }
       return shadow(this, 'isEnabled', enabled);
     },
-    composeSMask: composeSMask,
+    composeSMask,
-    drawFigures: drawFigures,
+    drawFigures,
     clear: cleanup
   };
 })();