From f06e165bd42f69a3f50677fe046bdbebd945937e Mon Sep 17 00:00:00 2001 From: ed Date: Sat, 18 Sep 2021 02:07:09 +0200 Subject: [PATCH] retro --- README.md | 2 +- copyparty/web/md.js | 15 ++++++++++++--- copyparty/web/util.js | 3 +++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2323fce6..fbd7a5a1 100644 --- a/README.md +++ b/README.md @@ -722,7 +722,7 @@ TLDR: yes | image viewer | - | yep | yep | yep | yep | yep | yep | yep | | video player | - | yep | yep | yep | yep | yep | yep | yep | | markdown editor | - | - | yep | yep | yep | yep | yep | yep | -| markdown viewer | - | - | yep | yep | yep | yep | yep | yep | +| markdown viewer | - | yep | yep | yep | yep | yep | yep | yep | | play mp3/m4a | - | yep | yep | yep | yep | yep | yep | yep | | play ogg/opus | - | - | - | - | yep | yep | `*3` | yep | | **= feature =** | ie6 | ie9 | ie10 | ie11 | ff 52 | c 49 | iOS | Andr | diff --git a/copyparty/web/md.js b/copyparty/web/md.js index d55d92d3..35a96a1f 100644 --- a/copyparty/web/md.js +++ b/copyparty/web/md.js @@ -267,7 +267,14 @@ function convert_markdown(md_text, dest_dom) { throw ex; } - var md_dom = new DOMParser().parseFromString(md_html, "text/html").body; + var md_dom = dest_dom; + try { + md_dom = new DOMParser().parseFromString(md_html, "text/html").body; + } + catch (ex) { + md_dom.innerHTML = md_html; + window.copydom = noop; + } var nodes = md_dom.getElementsByTagName('a'); for (var a = nodes.length - 1; a >= 0; a--) { @@ -502,9 +509,11 @@ img_load.callbacks = [toc.refresh]; // scroll handler var redraw = (function () { - var sbs = false; + var sbs = true; function onresize() { - sbs = window.matchMedia('(min-width: 64em)').matches; + if (window.matchMedia) + sbs = window.matchMedia('(min-width: 64em)').matches; + var y = (dom_hbar.offsetTop + dom_hbar.offsetHeight) + 'px'; if (sbs) { dom_toc.style.top = y; diff --git a/copyparty/web/util.js b/copyparty/web/util.js index 79ca1c9e..42c03762 100644 --- a/copyparty/web/util.js +++ b/copyparty/web/util.js @@ -169,6 +169,9 @@ function ignex(all) { } +function noop() { } + + function ctrl(e) { return e && (e.ctrlKey || e.metaKey); }