[api-major] Move the remaining options from, and completely remove, the global PDFJS object

examples/acroforms/acroforms.js

@@ -15,7 +15,7 @@
 
 'use strict';
 
-PDFJS.GlobalWorkerOptions.workerSrc =
+pdfjsDistBuildPdf.GlobalWorkerOptions.workerSrc =
   '../../node_modules/pdfjs-dist/build/pdf.worker.js';
 
 var DEFAULT_URL = '../../test/pdfs/f1040.pdf';
@@ -24,20 +24,20 @@ var DEFAULT_SCALE = 1.0;
 var container = document.getElementById('pageContainer');
 
 // Fetch the PDF document from the URL using promises.
-PDFJS.getDocument(DEFAULT_URL).then(function (doc) {
+pdfjsDistBuildPdf.getDocument(DEFAULT_URL).then(function (doc) {
   // Use a promise to fetch and render the next page.
   var promise = Promise.resolve();
 
   for (var i = 1; i <= doc.numPages; i++) {
     promise = promise.then(function (pageNum) {
       return doc.getPage(pageNum).then(function (pdfPage) {
         // Create the page view.
-        var pdfPageView = new PDFJS.PDFPageView({
+        var pdfPageView = new pdfjsDistWebPdfViewer.PDFPageView({
           container: container,
           id: pageNum,
           scale: DEFAULT_SCALE,
           defaultViewport: pdfPage.getViewport(DEFAULT_SCALE),
-          annotationLayerFactory: new PDFJS.DefaultAnnotationLayerFactory(),
+          annotationLayerFactory: new pdfjsDistWebPdfViewer.DefaultAnnotationLayerFactory(),
           renderInteractiveForms: true,
         });
 

examples/browserify/main.js

@@ -3,16 +3,16 @@
 
 // Hello world example for browserify.
 
-require('pdfjs-dist');
+var pdfjsLib = require('pdfjs-dist');
 
 var pdfPath = '../helloworld/helloworld.pdf';
 
 // Setting worker path to worker bundle.
-PDFJS.GlobalWorkerOptions.workerSrc =
+pdfjsLib.GlobalWorkerOptions.workerSrc =
   '../../build/browserify/pdf.worker.bundle.js';
 
 // Loading a document.
-var loadingTask = PDFJS.getDocument(pdfPath);
+var loadingTask = pdfjsLib.getDocument(pdfPath);
 loadingTask.promise.then(function (pdfDocument) {
   // Request a first page
   return pdfDocument.getPage(1).then(function (pdfPage) {

examples/components/pageviewer.js

@@ -15,20 +15,20 @@
 
 'use strict';
 
-if (!PDFJS.PDFViewer || !PDFJS.getDocument) {
+if (!pdfjsDistBuildPdf.getDocument || !pdfjsDistWebPdfViewer.PDFPageView) {
   alert('Please build the pdfjs-dist library using\n' +
         '  `gulp dist-install`');
 }
 
 // The workerSrc property shall be specified.
 //
-PDFJS.GlobalWorkerOptions.workerSrc =
+pdfjsDistBuildPdf.GlobalWorkerOptions.workerSrc =
   '../../node_modules/pdfjs-dist/build/pdf.worker.js';
 
 // Some PDFs need external cmaps.
 //
-// PDFJS.cMapUrl = '../../node_modules/pdfjs-dist/cmaps/';
-// PDFJS.cMapPacked = true;
+var CMAP_URL = '../../node_modules/pdfjs-dist/cmaps/';
+var CMAP_PACKED = true;
 
 var DEFAULT_URL = '../../web/compressed.tracemonkey-pldi-09.pdf';
 var PAGE_TO_VIEW = 1;
@@ -37,18 +37,22 @@ var SCALE = 1.0;
 var container = document.getElementById('pageContainer');
 
 // Loading document.
-PDFJS.getDocument(DEFAULT_URL).then(function (pdfDocument) {
+pdfjsDistBuildPdf.getDocument({
+  url: DEFAULT_URL,
+  cMapUrl: CMAP_URL,
+  cMapPacked: CMAP_PACKED,
+}).then(function(pdfDocument) {
   // Document loaded, retrieving the page.
   return pdfDocument.getPage(PAGE_TO_VIEW).then(function (pdfPage) {
     // Creating the page view with default parameters.
-    var pdfPageView = new PDFJS.PDFPageView({
+    var pdfPageView = new pdfjsDistWebPdfViewer.PDFPageView({
       container: container,
       id: PAGE_TO_VIEW,
       scale: SCALE,
       defaultViewport: pdfPage.getViewport(SCALE),
       // We can enable text/annotations layers, if needed
-      textLayerFactory: new PDFJS.DefaultTextLayerFactory(),
-      annotationLayerFactory: new PDFJS.DefaultAnnotationLayerFactory()
+      textLayerFactory: new pdfjsDistWebPdfViewer.DefaultTextLayerFactory(),
+      annotationLayerFactory: new pdfjsDistWebPdfViewer.DefaultAnnotationLayerFactory(),
     });
     // Associates the actual page with the view, and drawing it
     pdfPageView.setPdfPage(pdfPage);

examples/components/simpleviewer.js

@@ -15,38 +15,38 @@
 
 'use strict';
 
-if (!PDFJS.PDFViewer || !PDFJS.getDocument) {
+if (!pdfjsDistBuildPdf.getDocument || !pdfjsDistWebPdfViewer.PDFViewer)  {
   alert('Please build the pdfjs-dist library using\n' +
         '  `gulp dist-install`');
 }
 
 // The workerSrc property shall be specified.
 //
-PDFJS.GlobalWorkerOptions.workerSrc =
+pdfjsDistBuildPdf.GlobalWorkerOptions.workerSrc =
   '../../node_modules/pdfjs-dist/build/pdf.worker.js';
 
 // Some PDFs need external cmaps.
 //
-// PDFJS.cMapUrl = '../../node_modules/pdfjs-dist/cmaps/';
-// PDFJS.cMapPacked = true;
+var CMAP_URL = '../../node_modules/pdfjs-dist/cmaps/';
+var CMAP_PACKED = true;
 
 var DEFAULT_URL = '../../web/compressed.tracemonkey-pldi-09.pdf';
 var SEARCH_FOR = ''; // try 'Mozilla';
 
 var container = document.getElementById('viewerContainer');
 
 // (Optionally) enable hyperlinks within PDF files.
-var pdfLinkService = new PDFJS.PDFLinkService();
+var pdfLinkService = new pdfjsDistWebPdfViewer.PDFLinkService();
 
-var pdfViewer = new PDFJS.PDFViewer({
+var pdfViewer = new pdfjsDistWebPdfViewer.PDFViewer({
   container: container,
   linkService: pdfLinkService,
 });
 pdfLinkService.setViewer(pdfViewer);
 
 // (Optionally) enable find controller.
-var pdfFindController = new PDFJS.PDFFindController({
-  pdfViewer: pdfViewer
+var pdfFindController = new pdfjsDistWebPdfViewer.PDFFindController({
+  pdfViewer: pdfViewer,
 });
 pdfViewer.setFindController(pdfFindController);
 
@@ -60,7 +60,11 @@ container.addEventListener('pagesinit', function () {
 });
 
 // Loading document.
-PDFJS.getDocument(DEFAULT_URL).then(function (pdfDocument) {
+pdfjsDistBuildPdf.getDocument({
+  url: DEFAULT_URL,
+  cMapUrl: CMAP_URL,
+  cMapPacked: CMAP_PACKED,
+}).then(function(pdfDocument) {
   // Document loaded, specifying document for the viewer and
   // the (optional) linkService.
   pdfViewer.setDocument(pdfDocument);

examples/components/singlepageviewer.js

@@ -15,38 +15,38 @@
 
 'use strict';
 
-if (!PDFJS.PDFSinglePageViewer || !PDFJS.getDocument) {
+if (!pdfjsDistBuildPdf.getDocument || !pdfjsDistWebPdfViewer.PDFSinglePageViewer) {
   alert('Please build the pdfjs-dist library using\n' +
         '  `gulp dist-install`');
 }
 
 // The workerSrc property shall be specified.
 //
-PDFJS.GlobalWorkerOptions.workerSrc =
+pdfjsDistBuildPdf.GlobalWorkerOptions.workerSrc =
   '../../node_modules/pdfjs-dist/build/pdf.worker.js';
 
 // Some PDFs need external cmaps.
 //
-// PDFJS.cMapUrl = '../../node_modules/pdfjs-dist/cmaps/';
-// PDFJS.cMapPacked = true;
+var CMAP_URL = '../../node_modules/pdfjs-dist/cmaps/';
+var CMAP_PACKED = true;
 
 var DEFAULT_URL = '../../web/compressed.tracemonkey-pldi-09.pdf';
 var SEARCH_FOR = ''; // try 'Mozilla';
 
 var container = document.getElementById('viewerContainer');
 
 // (Optionally) enable hyperlinks within PDF files.
-var pdfLinkService = new PDFJS.PDFLinkService();
+var pdfLinkService = new pdfjsDistWebPdfViewer.PDFLinkService();
 
-var pdfSinglePageViewer = new PDFJS.PDFSinglePageViewer({
+var pdfSinglePageViewer = new pdfjsDistWebPdfViewer.PDFSinglePageViewer({
   container: container,
   linkService: pdfLinkService,
 });
 pdfLinkService.setViewer(pdfSinglePageViewer);
 
 // (Optionally) enable find controller.
-var pdfFindController = new PDFJS.PDFFindController({
-  pdfViewer: pdfSinglePageViewer
+var pdfFindController = new pdfjsDistWebPdfViewer.PDFFindController({
+  pdfViewer: pdfSinglePageViewer,
 });
 pdfSinglePageViewer.setFindController(pdfFindController);
 
@@ -60,7 +60,11 @@ container.addEventListener('pagesinit', function () {
 });
 
 // Loading document.
-PDFJS.getDocument(DEFAULT_URL).then(function (pdfDocument) {
+pdfjsDistBuildPdf.getDocument({
+  url: DEFAULT_URL,
+  cMapUrl: CMAP_URL,
+  cMapPacked: CMAP_PACKED,
+}).then(function(pdfDocument) {
   // Document loaded, specifying document for the viewer and
   // the (optional) linkService.
   pdfSinglePageViewer.setDocument(pdfDocument);

examples/learning/helloworld.html

@@ -22,13 +22,13 @@ <h1>'Hello, world!' example</h1>
   //
   // The workerSrc property shall be specified.
   //
-  PDFJS.GlobalWorkerOptions.workerSrc =
+  pdfjsDistBuildPdf.GlobalWorkerOptions.workerSrc =
     '../../node_modules/pdfjs-dist/build/pdf.worker.js';
 
   //
   // Asynchronous download PDF
   //
-  PDFJS.getDocument(url).then(function getPdfHelloWorld(pdf) {
+  pdfjsDistBuildPdf.getDocument(url).then(function getPdfHelloWorld(pdf) {
     //
     // Fetch the first page
     //

examples/learning/helloworld64.html

@@ -34,12 +34,12 @@ <h1>'Hello, world!' example</h1>
   //
   // The workerSrc property shall be specified.
   //
-  PDFJS.GlobalWorkerOptions.workerSrc =
+  pdfjsDistBuildPdf.GlobalWorkerOptions.workerSrc =
     '../../node_modules/pdfjs-dist/build/pdf.worker.js';
 
   // Opening PDF by passing its binary data as a string. It is still preferable
   // to use Uint8Array, but string or array-like structure will work too.
-  PDFJS.getDocument({data: pdfData}).then(function getPdfHelloWorld(pdf) {
+  pdfjsDistBuildPdf.getDocument({data: pdfData}).then(function getPdfHelloWorld(pdf) {
     // Fetch the first page.
     pdf.getPage(1).then(function getPageHelloWorld(page) {
       var scale = 1.5;

examples/learning/prevnext.html

@@ -33,8 +33,8 @@ <h1>'Previous/Next' example</h1>
   // pdf.js's one, or the pdf.js is executed via eval(), the workerSrc property
   // shall be specified.
   //
-  // PDFJS.GlobalWorkerOptions.workerSrc =
-  //   '../../node_modules/pdfjs-dist/build/pdf.worker.js';
+  pdfjsDistBuildPdf.GlobalWorkerOptions.workerSrc =
+    '../../node_modules/pdfjs-dist/build/pdf.worker.js';
 
   var pdfDoc = null,
       pageNum = 1,
@@ -117,7 +117,7 @@ <h1>'Previous/Next' example</h1>
   /**
    * Asynchronously downloads PDF.
    */
-  PDFJS.getDocument(url).then(function (pdfDoc_) {
+  pdfjsDistBuildPdf.getDocument(url).then(function (pdfDoc_) {
     pdfDoc = pdfDoc_;
     document.getElementById('page_count').textContent = pdfDoc.numPages;