Fix nits

Author: calixteman

src/core/worker.js

@@ -517,7 +517,6 @@ class WorkerMessageHandler {
       "GetOperatorList",
       function wphSetupRenderPage(data, sink) {
         var pageIndex = data.pageIndex;
-        const annotationStorage = data.annotationStorage;
         pdfManager.getPage(pageIndex).then(function (page) {
           var task = new WorkerTask(`GetOperatorList: page ${pageIndex}`);
           startWorkerTask(task);
@@ -533,7 +532,7 @@ class WorkerMessageHandler {
               task,
               intent: data.intent,
               renderInteractiveForms: data.renderInteractiveForms,
-              annotationStorage,
+              annotationStorage: data.annotationStorage,
             })
             .then(
               function (operatorListInfo) {

src/display/annotation_layer.js

@@ -543,6 +543,7 @@ class CheckboxWidgetAnnotationElement extends WidgetAnnotationElement {
    */
   render() {
     this.container.className = "buttonWidgetAnnotation checkBox";
+
     const element = document.createElement("input");
     element.disabled = this.data.readOnly;
     element.type = "checkbox";

src/display/annotation_storage.js

@@ -1,4 +1,4 @@
-/* Copyright 2014 Mozilla Foundation
+/* Copyright 2020 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,21 +14,21 @@
  */
 
 class AnnotationStorage {
-  constructor(storage = {}) {
-    this._storage = storage;
+  constructor() {
+    this._storage = {};
   }
 
   /**
-   * Get the value for a given key if it doesn't exist
-   * or store and return the defaultValue
+   * Get the value for a given key if it exists
+   * or store and return the default value
    *
    * @public
    * @memberof AnnotationStorage
-   * @param {String} key
+   * @param {string} key
    * @param {Object} defaultValue
    * @returns {Object}
    */
-  getOrCreate(key, defaultValue) {
+  getOrCreateValue(key, defaultValue) {
     if (key in this._storage) {
       return this._storage[key];
     }
@@ -49,7 +49,7 @@ class AnnotationStorage {
     this._storage[key] = value;
   }
 
-  getDict() {
+  getAll() {
     return this._storage;
   }
 }

src/display/api.js

@@ -581,7 +581,7 @@ class PDFDocumentProxy {
   }
 
   /**
-   * @type {AnnotationStorage} storage for annotations.
+   * @type {AnnotationStorage} Storage for annotation data in forms.
    */
   get annotationStorage() {
     return this._annotationStorage;

test/unit/annotation_storage_spec.js

@@ -16,15 +16,15 @@
 import { AnnotationStorage } from "../../src/display/annotation_storage.js";
 
 describe("AnnotationStorage", function () {
-  describe("GetOrCreate", function () {
+  describe("GetOrCreateValue", function () {
     it("should get and set a new value in the annotation storage", function (done) {
       const annotationStorage = new AnnotationStorage();
-      let value = annotationStorage.getOrCreate("123A", "hello world");
+      let value = annotationStorage.getOrCreateValue("123A", "hello world");
       expect(value).toEqual("hello world");
 
       // the second argument is the default value to use
       // if the key isn't in the storage
-      value = annotationStorage.getOrCreate("123A", "an other string");
+      value = annotationStorage.getOrCreateValue("123A", "an other string");
       expect(value).toEqual("hello world");
       done();
     });
@@ -34,7 +34,7 @@ describe("AnnotationStorage", function () {
     it("should set a new value in the annotation storage", function (done) {
       const annotationStorage = new AnnotationStorage();
       annotationStorage.setValue("123A", "an other string");
-      const value = annotationStorage.getDict()["123A"];
+      const value = annotationStorage.getAll()["123A"];
       expect(value).toEqual("an other string");
       done();
     });

test/unit/jasmine-boot.js

@@ -13,26 +13,26 @@
  * limitations under the License.
  */
 /*
-   Copyright (c) 2008-2016 Pivotal Labs
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   "Software"), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject to
-   the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-   LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ Copyright (c) 2008-2016 Pivotal Labs
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 /* globals jasmineRequire, TestReporter */
 

web/firefox_print_service.js

@@ -53,7 +53,7 @@ function composePage(pdfDocument, pageNumber, size, printContainer) {
           transform: [PRINT_UNITS, 0, 0, PRINT_UNITS, 0, 0],
           viewport: pdfPage.getViewport({ scale: 1, rotation: size.rotation }),
           intent: "print",
-          annotationStorage: pdfDocument.annotationStorage.getDict(),
+          annotationStorage: pdfDocument.annotationStorage.getAll(),
         };
         return pdfPage.render(renderContext).promise;
       })

web/pdf_print_service.js

@@ -49,7 +49,7 @@ function renderPage(activeServiceOnEntry, pdfDocument, pageNumber, size) {
         transform: [PRINT_UNITS, 0, 0, PRINT_UNITS, 0, 0],
         viewport: pdfPage.getViewport({ scale: 1, rotation: size.rotation }),
         intent: "print",
-        annotationStorage: pdfDocument.annotationStorage.getDict(),
+        annotationStorage: pdfDocument.annotationStorage.getAll(),
       };
       return pdfPage.render(renderContext).promise;
     })