Merge branch 'master' of git+ssh://taler.net/var/git/wallet-webex

1 files changed, 20 insertions, 13 deletions

diff --git a/pages/show-db.ts b/pages/show-db.ts
index 9a7b315cf..71e74388b 100644
--- a/pages/show-db.ts
+++ b/pages/show-db.ts
@@ -21,30 +21,37 @@
  * @author Florian Dold
  */
 
-function replacer(match, pIndent, pKey, pVal, pEnd) {
+function replacer(match: string, pIndent: string, pKey: string, pVal: string,
+                  pEnd: string) {
   var key = '<span class=json-key>';
   var val = '<span class=json-value>';
   var str = '<span class=json-string>';
   var r = pIndent || '';
-  if (pKey)
-     r = r + key + pKey.replace(/[": ]/g, '') + '</span>: ';
-  if (pVal)
-     r = r + (pVal[0] == '"' ? str : val) + pVal + '</span>';
+  if (pKey) {
+    r = r + key + pKey.replace(/[": ]/g, '') + '</span>: ';
+  }
+  if (pVal) {
+    r = r + (pVal[0] == '"' ? str : val) + pVal + '</span>';
+  }
   return r + (pEnd || '');
 }
 
 
-function prettyPrint(obj) {
+function prettyPrint(obj: any) {
   var jsonLine = /^( *)("[\w]+": )?("[^"]*"|[\w.+-]*)?([,[{])?$/mg;
-  return JSON.stringify(obj, null, 3)
-     .replace(/&/g, '&amp;').replace(/\\"/g, '&quot;')
-     .replace(/</g, '&lt;').replace(/>/g, '&gt;')
-     .replace(jsonLine, replacer);
+  return JSON.stringify(obj, null as any, 3)
+             .replace(/&/g, '&amp;').replace(/\\"/g, '&quot;')
+             .replace(/</g, '&lt;').replace(/>/g, '&gt;')
+             .replace(jsonLine, replacer);
 }
 
 
-document.addEventListener("DOMContentLoaded", (e) => {
-  chrome.runtime.sendMessage({type:'dump-db'}, (resp) => {
-    document.getElementById('dump').innerHTML = prettyPrint(resp);
+document.addEventListener("DOMContentLoaded", () => {
+  chrome.runtime.sendMessage({type: 'dump-db'}, (resp) => {
+    const el = document.getElementById('dump');
+    if (!el) {
+      throw Error();
+    }
+    el.innerHTML = prettyPrint(resp);
   });
 });