From 02a91f60d42779564cb7710fba8f49b941889ce2 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Thu, 15 Jul 2021 23:19:37 +0200
Subject: [PATCH] playing some golf

---
 copyparty/web/baguettebox.js |  4 +--
 copyparty/web/browser.js     |  8 +++---
 copyparty/web/md2.js         | 53 +++++++++++++++++++-----------------
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/copyparty/web/baguettebox.js b/copyparty/web/baguettebox.js
index ee241603..c33ea7f8 100644
--- a/copyparty/web/baguettebox.js
+++ b/copyparty/web/baguettebox.js
@@ -97,7 +97,7 @@ window.baguetteBox = (function () {
     }
 
     function bindImageClickListeners(selector, userOptions) {
-        var galleryNodeList = document.querySelectorAll(selector);
+        var galleryNodeList = QSA(selector);
         var selectorData = {
             galleries: [],
             nodeList: galleryNodeList
@@ -491,7 +491,7 @@ window.baguetteBox = (function () {
 
         image.addEventListener(is_vid ? 'loadedmetadata' : 'load', function () {
             // Remove loader element
-            var spinner = document.querySelector('#baguette-img-' + index + ' .bbox-spinner');
+            var spinner = QS('#baguette-img-' + index + ' .bbox-spinner');
             figure.removeChild(spinner);
             if (!options.async && callback)
                 callback();
diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js
index ecc7a2be..86fe4701 100644
--- a/copyparty/web/browser.js
+++ b/copyparty/web/browser.js
@@ -605,7 +605,7 @@ var widget = (function () {
 
 		m += '[' + cv + s2ms(mp.au.currentTime) + ck + '/' + cv + s2ms(mp.au.duration) + ck + ']';
 
-		var o = document.createElement('input');
+		var o = mknod('input');
 		o.style.cssText = 'position:fixed;top:45%;left:48%;padding:1em;z-index:9';
 		o.value = m;
 		document.body.appendChild(o);
@@ -1451,7 +1451,7 @@ function play_linked() {
 
 var thegrid = (function () {
 	var lfiles = ebi('files'),
-		gfiles = document.createElement('div');
+		gfiles = mknod('div');
 
 	gfiles.setAttribute('id', 'gfiles');
 	gfiles.style.display = 'none';
@@ -1553,7 +1553,7 @@ var thegrid = (function () {
 	setsz();
 
 	function gclick(e) {
-		if (e && (e.ctrlKey || e.metaKey))
+		if (ctrl(e))
 			return true;
 
 		var oth = ebi(this.getAttribute('ref')),
@@ -2301,7 +2301,7 @@ var treectl = (function () {
 	}
 
 	function treego(e) {
-		if (e && (e.ctrlKey || e.metaKey))
+		if (ctrl(e))
 			return true;
 
 		ev(e);
diff --git a/copyparty/web/md2.js b/copyparty/web/md2.js
index be3589cc..41bb69c9 100644
--- a/copyparty/web/md2.js
+++ b/copyparty/web/md2.js
@@ -925,9 +925,8 @@ function cfg_uni(e) {
     function keydown(ev) {
         ev = ev || window.event;
         var kc = ev.keyCode || ev.which;
-        var ctrl = ev.ctrlKey || ev.metaKey;
         //console.log(ev.code, kc);
-        if (ctrl && (ev.code == "KeyS" || kc == 83)) {
+        if (ctrl(ev) && (ev.code == "KeyS" || kc == 83)) {
             save();
             return false;
         }
@@ -936,23 +935,15 @@ function cfg_uni(e) {
             if (d)
                 d.click();
         }
-        if (document.activeElement == dom_src) {
-            if (ev.code == "Tab" || kc == 9) {
-                md_indent(ev.shiftKey);
-                return false;
-            }
-            if (ctrl && (ev.code == "KeyH" || kc == 72)) {
+        if (document.activeElement != dom_src)
+            return true;
+
+        if (ctrl(ev)) {
+            if (ev.code == "KeyH" || kc == 72) {
                 md_header(ev.shiftKey);
                 return false;
             }
-            if (!ctrl && (ev.code == "Home" || kc == 36)) {
-                md_home(ev.shiftKey);
-                return false;
-            }
-            if (!ctrl && !ev.shiftKey && (ev.code == "Enter" || kc == 13)) {
-                return md_newline();
-            }
-            if (ctrl && (ev.code == "KeyZ" || kc == 90)) {
+            if (ev.code == "KeyZ" || kc == 90) {
                 if (ev.shiftKey)
                     action_stack.redo();
                 else
@@ -960,33 +951,45 @@ function cfg_uni(e) {
 
                 return false;
             }
-            if (ctrl && (ev.code == "KeyY" || kc == 89)) {
+            if (ev.code == "KeyY" || kc == 89) {
                 action_stack.redo();
                 return false;
             }
-            if (!ctrl && !ev.shiftKey && kc == 8) {
-                return md_backspace();
-            }
-            if (ctrl && (ev.code == "KeyK")) {
+            if (ev.code == "KeyK") {
                 fmt_table();
                 return false;
             }
-            if (ctrl && (ev.code == "KeyU")) {
+            if (ev.code == "KeyU") {
                 iter_uni();
                 return false;
             }
-            if (ctrl && (ev.code == "KeyE")) {
+            if (ev.code == "KeyE") {
                 dom_nsbs.click();
-                //fmt_table();
                 return false;
             }
             var up = ev.code == "ArrowUp" || kc == 38;
             var dn = ev.code == "ArrowDown" || kc == 40;
-            if (ctrl && (up || dn)) {
+            if (up || dn) {
                 md_p_jump(dn);
                 return false;
             }
         }
+        else {
+            if (ev.code == "Tab" || kc == 9) {
+                md_indent(ev.shiftKey);
+                return false;
+            }
+            if (ev.code == "Home" || kc == 36) {
+                md_home(ev.shiftKey);
+                return false;
+            }
+            if (!ev.shiftKey && (ev.code == "Enter" || kc == 13)) {
+                return md_newline();
+            }
+            if (!ev.shiftKey && kc == 8) {
+                return md_backspace();
+            }
+        }
     }
     document.onkeydown = keydown;
     ebi('save').onclick = save;