From 9962ab66ab9db393e987d5ce14ffa34a5612a8f1 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Mon, 24 Dec 2018 12:28:20 +0100
Subject: [PATCH] Update remaining examples, and docs, to utilize current API
 functionality (issue 10377)

This contains a couple of changes that I missed elsewhere, sorry about that!
---
 docs/contents/examples/index.md     | 11 ++++++-----
 examples/learning/helloworld.html   |  4 ++--
 examples/learning/helloworld64.html |  6 +++---
 examples/learning/prevnext.html     |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docs/contents/examples/index.md b/docs/contents/examples/index.md
index 4a58257b1ed2f..437448fae522b 100644
--- a/docs/contents/examples/index.md
+++ b/docs/contents/examples/index.md
@@ -20,10 +20,11 @@ The object structure of PDF.js loosely follows the structure of an actual PDF. A
 pdfjsLib.getDocument('helloworld.pdf')
 ```
 
-Remember though that PDF.js uses promises, so the above will return a promise that is resolved with the document object.
+Remember though that PDF.js uses promises, and the above will return a `PDFDocumentLoadingTask` instance that has a `promise` property which is resolved with the document object.
 
 ```js
-pdfjsLib.getDocument('helloworld.pdf').then(function(pdf) {
+var loadingTask = pdfjsLib.getDocument('helloworld.pdf');
+loadingTask.promise.then(function(pdf) {
   // you can now use *pdf* here
 });
 ```
@@ -42,7 +43,7 @@ Each PDF page has its own viewport which defines the size in pixels(72DPI) and i
 
 ```js
 var scale = 1.5;
-var viewport = page.getViewport(scale);
+var viewport = page.getViewport({ scale: scale, });
 
 var canvas = document.getElementById('the-canvas');
 var context = canvas.getContext('2d');
@@ -60,9 +61,9 @@ Alternatively, if you want the canvas to render to a certain pixel size you coul
 
 ```js
 var desiredWidth = 100;
-var viewport = page.getViewport(1);
+var viewport = page.getViewport({ scale: 1, });
 var scale = desiredWidth / viewport.width;
-var scaledViewport = page.getViewport(scale);
+var scaledViewport = page.getViewport({ scale: scale, });
 ```
 
 ## Interactive examples
diff --git a/examples/learning/helloworld.html b/examples/learning/helloworld.html
index c73f0329de119..74ef35e599b03 100644
--- a/examples/learning/helloworld.html
+++ b/examples/learning/helloworld.html
@@ -35,7 +35,7 @@ <h1>'Hello, world!' example</h1>
     //
     pdf.getPage(1).then(function(page) {
       var scale = 1.5;
-      var viewport = page.getViewport(scale);
+      var viewport = page.getViewport({ scale: scale, });
 
       //
       // Prepare canvas using PDF page dimensions
@@ -50,7 +50,7 @@ <h1>'Hello, world!' example</h1>
       //
       var renderContext = {
         canvasContext: context,
-        viewport: viewport
+        viewport: viewport,
       };
       page.render(renderContext);
     });
diff --git a/examples/learning/helloworld64.html b/examples/learning/helloworld64.html
index d316a6a06f6c2..e8a02394808ce 100644
--- a/examples/learning/helloworld64.html
+++ b/examples/learning/helloworld64.html
@@ -39,12 +39,12 @@ <h1>'Hello, world!' example</h1>
 
   // 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.
-  var loadingTask = pdfjsLib.getDocument({data: pdfData});
+  var loadingTask = pdfjsLib.getDocument({ data: pdfData, });
   loadingTask.promise.then(function(pdf) {
     // Fetch the first page.
     pdf.getPage(1).then(function(page) {
       var scale = 1.5;
-      var viewport = page.getViewport(scale);
+      var viewport = page.getViewport({ scale: scale, });
 
       // Prepare canvas using PDF page dimensions.
       var canvas = document.getElementById('the-canvas');
@@ -55,7 +55,7 @@ <h1>'Hello, world!' example</h1>
       // Render PDF page into canvas context.
       var renderContext = {
         canvasContext: context,
-        viewport: viewport
+        viewport: viewport,
       };
       page.render(renderContext);
     });
diff --git a/examples/learning/prevnext.html b/examples/learning/prevnext.html
index 32fc7247672f3..2b91594113c81 100644
--- a/examples/learning/prevnext.html
+++ b/examples/learning/prevnext.html
@@ -52,14 +52,14 @@ <h1>'Previous/Next' example</h1>
     pageRendering = true;
     // Using promise to fetch the page
     pdfDoc.getPage(num).then(function(page) {
-      var viewport = page.getViewport(scale);
+      var viewport = page.getViewport({ scale: scale, });
       canvas.height = viewport.height;
       canvas.width = viewport.width;
 
       // Render PDF page into canvas context
       var renderContext = {
         canvasContext: ctx,
-        viewport: viewport
+        viewport: viewport,
       };
       var renderTask = page.render(renderContext);