From a6128f295b3c8ec9c41f859b64cfd4d2ecd2f087 Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Tue, 3 Apr 2018 17:36:56 +0100
Subject: [PATCH] Fix printing bug which caused unhandled exception in WAAHost

Former-commit-id: e5b1de0e3ce9767dce57fbe50ccc291eeab04309 [formerly 2ee69678462efc83cf2c8baf39915781b3f8500f]
Former-commit-id: 4f82cd78e1e4cca3586fd5c24be1e66a1ba51943
---
 www/index.html | 15 +++++++++++++++
 www/js/app.js  | 15 ++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/www/index.html b/www/index.html
index 7cba8235..b3b8e351 100644
--- a/www/index.html
+++ b/www/index.html
@@ -144,6 +144,21 @@
             </div>
         </div>
     </div>
+    <div id="alertModal" class="modal">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">Alert!</h4>
+                </div>
+                <div class="modal-body">
+                    <p id="alertContent"></p>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary" type="button" data-dismiss="modal">Dismiss</button>
+                </div>
+            </div>
+        </div>
+    </div>
     <section id="search-article" role="region">
         <header id="top" style="width:100%;">
             <nav id="navbar" class="navbar navbar-inverse" role="navigation">
diff --git a/www/js/app.js b/www/js/app.js
index eb60e7fa..be09f113 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -162,6 +162,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
 
 
         function printIntercept() {
+            document.getElementById('btnAbout').classList.add('active');
             //Pre-load all images in case user wants to print them
             if (params.imageDisplay) {
                 loadImages(10000);
@@ -193,12 +194,17 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
                     return;
                 }
                 uiUtil.printCustomElements();
+                document.getElementById("alertContent").innerHTML = "Document will reload to restore the DOM after printing...";
+                $("#alertModal").modal({
+                    backdrop: "static",
+                    keyboard: true
+                });
                 //innerDocument.execCommand("print", false, null);
                 window.frames[0].frameElement.contentWindow.print();
-                setTimeout(function () {
-                    //Reload article after print dialogue has rendered because DOM is destroyed
-                    goToArticle(decodeURIComponent(history.state.title));
-                }, 3000);
+            });
+            $("#alertModal").off('hide.bs.modal');
+            $("#alertModal").on('hide.bs.modal', function () {
+                goToArticle(decodeURIComponent(history.state.title));
             });
         }
 
@@ -542,7 +548,6 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
         $('#btnAbout').on('click', function (e) {
             var btnAboutElement = document.getElementById('btnAbout');
             if (/glyphicon-print/.test(btnAboutElement.innerHTML)) {
-                btnAboutElement.classList.add('active');
                 printIntercept();
                 return;
             }