Convert the annotation layer builder to ES6 syntax

web/annotation_layer_builder.js

@@ -26,15 +26,11 @@ import { SimpleLinkService } from './pdf_link_service';
  * @property {DownloadManager} downloadManager
  */
 
-/**
+class AnnotationLayerBuilder {
- * @class
- */
-var AnnotationLayerBuilder = (function AnnotationLayerBuilderClosure() {
   /**
    * @param {AnnotationLayerBuilderOptions} options
-   * @constructs AnnotationLayerBuilder
    */
-  function AnnotationLayerBuilder(options) {
+  constructor(options) {
     this.pageDiv = options.pageDiv;
     this.pdfPage = options.pdfPage;
     this.renderInteractiveForms = options.renderInteractiveForms;
@@ -44,32 +40,23 @@ var AnnotationLayerBuilder = (function AnnotationLayerBuilderClosure() {
     this.div = null;
   }
 
-  AnnotationLayerBuilder.prototype =
-      /** @lends AnnotationLayerBuilder.prototype */ {
-
   /**
    * @param {PageViewport} viewport
    * @param {string} intent (default value is 'display')
    */
-    render: function AnnotationLayerBuilder_render(viewport, intent) {
+  render(viewport, intent = 'display') {
-      var self = this;
+    this.pdfPage.getAnnotations({ intent }).then((annotations) => {
       var parameters = {
-        intent: (intent === undefined ? 'display' : intent),
+        viewport: viewport.clone({ dontFlip: true }),
-      };
+        div: this.div,
-
+        annotations,
-      this.pdfPage.getAnnotations(parameters).then(function (annotations) {
+        page: this.pdfPage,
-        viewport = viewport.clone({ dontFlip: true });
+        renderInteractiveForms: this.renderInteractiveForms,
-        parameters = {
+        linkService: this.linkService,
-          viewport: viewport,
+        downloadManager: this.downloadManager,
-          div: self.div,
-          annotations: annotations,
-          page: self.pdfPage,
-          renderInteractiveForms: self.renderInteractiveForms,
-          linkService: self.linkService,
-          downloadManager: self.downloadManager,
       };
 
-        if (self.div) {
+      if (this.div) {
         // If an annotationLayer already exists, refresh its children's
         // transformation matrices.
         AnnotationLayer.update(parameters);
@@ -80,52 +67,47 @@ var AnnotationLayerBuilder = (function AnnotationLayerBuilderClosure() {
           return;
         }
 
-          self.div = document.createElement('div');
+        this.div = document.createElement('div');
-          self.div.className = 'annotationLayer';
+        this.div.className = 'annotationLayer';
-          self.pageDiv.appendChild(self.div);
+        this.pageDiv.appendChild(this.div);
-          parameters.div = self.div;
+        parameters.div = this.div;
 
         AnnotationLayer.render(parameters);
         if (typeof mozL10n !== 'undefined') {
-            mozL10n.translate(self.div);
+          mozL10n.translate(this.div);
         }
       }
     });
-    },
+  }
 
-    hide: function AnnotationLayerBuilder_hide() {
+  hide() {
     if (!this.div) {
       return;
     }
     this.div.setAttribute('hidden', 'true');
   }
-  };
+}
-
-  return AnnotationLayerBuilder;
-})();
 
 /**
- * @constructor
  * @implements IPDFAnnotationLayerFactory
  */
-function DefaultAnnotationLayerFactory() {}
+class DefaultAnnotationLayerFactory {
-DefaultAnnotationLayerFactory.prototype = {
   /**
    * @param {HTMLDivElement} pageDiv
    * @param {PDFPage} pdfPage
    * @param {boolean} renderInteractiveForms
    * @returns {AnnotationLayerBuilder}
    */
-  createAnnotationLayerBuilder: function (pageDiv, pdfPage,
+  createAnnotationLayerBuilder(pageDiv, pdfPage,
-                                          renderInteractiveForms) {
+                               renderInteractiveForms = false) {
     return new AnnotationLayerBuilder({
-      pageDiv: pageDiv,
+      pageDiv,
-      pdfPage: pdfPage,
+      pdfPage,
-      renderInteractiveForms: renderInteractiveForms,
+      renderInteractiveForms,
       linkService: new SimpleLinkService(),
     });
   }
-};
+}
 
 export {
   AnnotationLayerBuilder,

web/interfaces.js

@@ -108,14 +108,13 @@ IPDFTextLayerFactory.prototype = {
 /**
  * @interface
  */
-function IPDFAnnotationLayerFactory() {}
+class IPDFAnnotationLayerFactory { // eslint-disable-line no-unused-vars
-IPDFAnnotationLayerFactory.prototype = {
   /**
    * @param {HTMLDivElement} pageDiv
    * @param {PDFPage} pdfPage
    * @param {boolean} renderInteractiveForms
    * @returns {AnnotationLayerBuilder}
    */
-  createAnnotationLayerBuilder: function (pageDiv, pdfPage,
+  createAnnotationLayerBuilder(pageDiv, pdfPage,
-                                          renderInteractiveForms) {}
+                               renderInteractiveForms = false) {}
-};
+}