Now PDF NEXT_PREV_CLOSE buttons are visible until manually closed

muaz-khan · Oct 17, 2018 · 197233d · 197233d
1 parent 67d122f
commit 197233d
Show file tree

Hide file tree

Showing 9 changed files with 569 additions and 23 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "canvas-designer",
   "preferGlobal": false,
-  "version": "1.2.3",
+  "version": "1.2.4",
   "author": {
     "name": "Muaz Khan",
     "email": "muazkh@gmail.com",

diff --git a/dev/data-uris.js b/dev/data-uris.js
diff --git a/dev/decorator.js b/dev/decorator.js
@@ -90,7 +90,7 @@ window.addEventListener('load', function() {
         }
 
         addEvent(context.canvas, 'click', function() {
-            pdfHandler.pdfPageContainer.style.display = 'none';
+            // pdfHandler.pdfPageContainer.style.display = 'none';
 
             if (textHandler.text.length) {
                 textHandler.appendPoints();

diff --git a/dev/pdf-handler.js b/dev/pdf-handler.js
@@ -1,12 +1,13 @@
 var pdfHandler = {
     lastPdfURL: null,
     lastIndex: 0,
-    lastPageIndex: null,
+    lastPointIndex: 0,
     removeWhiteBackground: false,
     pdfPageContainer: document.getElementById('pdf-page-container'),
     pdfPagesList: document.getElementById('pdf-pages-list'),
     pdfNext: document.getElementById('pdf-next'),
     pdfPrev: document.getElementById('pdf-prev'),
+    pdfClose: document.getElementById('pdf-close'),
     pageNumber: 1,
 
     images: [],
@@ -85,6 +86,8 @@ var pdfHandler = {
             var t = pdfHandler;
             pdfHandler.lastIndex = pdfHandler.images.length;
             var point = [lastPage, 60, 20, width, height, pdfHandler.lastIndex];
+
+            pdfHandler.lastPointIndex = points.length;
             points[points.length] = ['pdf', point, drawHelper.getOptions()];
 
             pdfHandler.pdfPagesList.innerHTML = '';
@@ -113,10 +116,15 @@ var pdfHandler = {
                 pdfHandler.pdfPagesList.onchange();
             };
 
+            pdfHandler.pdfClose.onclick = function() {
+                pdfHandler.pdfPageContainer.style.display = 'none';
+            };
+
             document.getElementById('drag-last-path').click();
 
             pdfHandler.pdfPrev.src = data_uris.pdf_next;
             pdfHandler.pdfNext.src = data_uris.pdf_prev;
+            pdfHandler.pdfClose.src = data_uris.pdf_close;
 
             pdfHandler.pdfPageContainer.style.top = '20px';
             pdfHandler.pdfPageContainer.style.left = (point[3] - parseInt(point[3] / 2)) + 'px';
@@ -143,7 +151,9 @@ var pdfHandler = {
 
         var t = this;
         if (t.ismousedown) {
-            points[points.length] = ['pdf', [pdfHandler.lastPage, t.prevX, t.prevY, x - t.prevX, y - t.prevY, pdfHandler.lastIndex], drawHelper.getOptions()];
+            if (points[pdfHandler.lastPointIndex]) {
+                points[pdfHandler.lastPointIndex] = ['pdf', [pdfHandler.lastPage, t.prevX, t.prevY, x - t.prevX, y - t.prevY, pdfHandler.lastIndex], drawHelper.getOptions()];
+            }
 
             t.ismousedown = false;
         }
@@ -160,10 +170,11 @@ var pdfHandler = {
     },
     reset_pos: function(x, y) {
         pdfHandler.pdfPageContainer.style.top = y + 'px';
-        var point = points[points.length - 1][1];
+        if (!points[pdfHandler.lastPointIndex]) return;
+        var point = points[pdfHandler.lastPointIndex][1];
         pdfHandler.pdfPageContainer.style.left = (point[1] + point[3] - parseInt(point[3] / 2) - parseInt(pdfHandler.pdfPageContainer.clientWidth / 2)) + 'px';
     },
     end: function() {
-        pdfHandler.pdfPageContainer.style.display = 'none';
+        // pdfHandler.pdfPageContainer.style.display = 'none';
     }
 };
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "canvas-designer",
   "preferGlobal": false,
-  "version": "1.2.3",
+  "version": "1.2.4",
   "author": {
     "name": "Muaz Khan",
     "email": "muazkh@gmail.com",