From 640d6c1acf8a1511ff6c3e51374c385c24086d01 Mon Sep 17 00:00:00 2001
From: Andrey Kuvshinov <delf@iMac-Andrey.local>
Date: Wed, 8 Apr 2020 20:02:51 +0300
Subject: [PATCH] new version anviewer

---
 app/modules/anpdf/anpdf2.phtml |  3 ++-
 app/pub/scripts/anviewer.js    | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/app/modules/anpdf/anpdf2.phtml b/app/modules/anpdf/anpdf2.phtml
index d1937de..649aa2b 100644
--- a/app/modules/anpdf/anpdf2.phtml
+++ b/app/modules/anpdf/anpdf2.phtml
@@ -2,6 +2,7 @@
 <head>
   <title>Еженедельник Аргументы Недели - <?=$title?></title>
   <script src="/pub/scripts/pdf.min.js"></script>
+  <script src="/pub/scripts/anviewer.js?ver=1"></script>
   <link rel="icon" type="image/ico" href="https://argumenti.ru/favicon.ico">
 </head>
 <body style="width: 87%;margin: 0px auto;margin-top: 2%;background: #f5f5f5;">  
@@ -98,7 +99,7 @@ _tmr.push({id: "1069168", type: "pageView", start: (new Date()).getTime()});
        </li>
     </ul>
 <canvas id="the-canvas"></canvas>
-<script src="/pub/scripts/anviewer.js"></script>
+<script>startpdfviewer();</script>
 
 <div style="display: flex;flex-wrap:wrap;align-items:center;width: 100%;background: #f5f5f5;box-sizing: border-box;">
     <ul id="pdf-nav" style="font-size: 1.1em;width: 100%;font-weight:bold;display: flex;justify-content: center;padding:0px;">
diff --git a/app/pub/scripts/anviewer.js b/app/pub/scripts/anviewer.js
index 5f84ea3..2d3f276 100644
--- a/app/pub/scripts/anviewer.js
+++ b/app/pub/scripts/anviewer.js
@@ -2,6 +2,9 @@ var pdfjsLib = window['pdfjs-dist/build/pdf'];
 
 
 function renderPage() {
+
+    document.getElementById('pdfprogress').innerHTML = 'Идет подготовка страницы ...';
+
     pageRendering = true;
     // Using promise to fetch the page
     pdfDoc.getPage(pageNum).then(function(page, ) {
@@ -49,18 +52,14 @@ function pdfzoomout(){
 
 }
 
-
-
-pdfjsLib.getDocument(url).promise.then(function(pdfDoc_) {
+function startpdfviewer(){
     
-    document.getElementById('pdfprogress').innerHTML = 'Идет подготовка страницы ...';
-
-    pdfDoc = pdfDoc_;
-    renderPage();
-  });
-
-
-
+    pdfjsLib.getDocument(url).promise.then(function(pdfDoc_) {
+        pdfDoc = pdfDoc_;
+        renderPage();
+    });
+    
+}
 
 
 
