From 85e95d34edd0e907e393beb2b4bce52b0bfa7fcb Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Wed, 16 Dec 2015 15:03:06 -0600 Subject: [PATCH] Use RequireJS in the viewer, examples and tests. --- examples/acroforms/forms.js | 32 ++++++---- examples/acroforms/index.html | 22 +------ examples/helloworld/hello.js | 52 +++++++-------- examples/helloworld/index.html | 21 +------ examples/svgviewer/index.html | 19 +----- examples/svgviewer/viewer.js | 20 +++--- external/umdutils/genhtml.js | 51 --------------- package.json | 3 +- src/display/text_layer.js | 20 +++--- src/expose_to_global.js | 35 ----------- test/font/font_test.html | 61 +++++------------- test/test_slave.html | 31 +++++---- test/unit/font_spec.js | 11 ++-- test/unit/unit_test.html | 112 ++++++++++++++++++++------------- web/pdf_page_view.js | 5 +- web/viewer.html | 13 +--- web/viewer.js | 24 +++++-- 17 files changed, 201 insertions(+), 331 deletions(-) delete mode 100644 external/umdutils/genhtml.js delete mode 100644 src/expose_to_global.js diff --git a/examples/acroforms/forms.js b/examples/acroforms/forms.js index eda306625..d7c40c8cc 100644 --- a/examples/acroforms/forms.js +++ b/examples/acroforms/forms.js @@ -5,6 +5,9 @@ 'use strict'; +// Specify the PDF with AcroForm here +var pdfWithFormsPath = '../../test/pdfs/f1040.pdf'; + var formFields = {}; function setupForm(div, content, viewport) { @@ -135,16 +138,23 @@ function renderPage(div, pdf, pageNumber, callback) { }); } -// Fetch the PDF document from the URL using promices -PDFJS.getDocument(pdfWithFormsPath).then(function getPdfForm(pdf) { - // Rendering all pages starting from first - var viewer = document.getElementById('viewer'); - var pageNumber = 1; - renderPage(viewer, pdf, pageNumber++, function pageRenderingComplete() { - if (pageNumber > pdf.numPages) { - return; // All pages rendered - } - // Continue rendering of the next page - renderPage(viewer, pdf, pageNumber++, pageRenderingComplete); +// In production, the bundled pdf.js shall be used instead of RequireJS. +require.config({paths: {'pdfjs': '../../src'}}); +require(['pdfjs/display/api'], function (api) { + // In production, change this to point to the built `pdf.worker.js` file. + PDFJS.workerSrc = '../../src/worker_loader.js'; + + // Fetch the PDF document from the URL using promises. + api.getDocument(pdfWithFormsPath).then(function getPdfForm(pdf) { + // Rendering all pages starting from first + var viewer = document.getElementById('viewer'); + var pageNumber = 1; + renderPage(viewer, pdf, pageNumber++, function pageRenderingComplete() { + if (pageNumber > pdf.numPages) { + return; // All pages rendered + } + // Continue rendering of the next page + renderPage(viewer, pdf, pageNumber++, pageRenderingComplete); + }); }); }); diff --git a/examples/acroforms/index.html b/examples/acroforms/index.html index 15b9fde64..6a217edd0 100644 --- a/examples/acroforms/index.html +++ b/examples/acroforms/index.html @@ -2,27 +2,7 @@ - - - - - - - - - - - - - - +