playing some golf

This commit is contained in:
ed 2021-07-15 23:19:37 +02:00
parent fae83da197
commit 02a91f60d4
3 changed files with 34 additions and 31 deletions

View file

@ -97,7 +97,7 @@ window.baguetteBox = (function () {
} }
function bindImageClickListeners(selector, userOptions) { function bindImageClickListeners(selector, userOptions) {
var galleryNodeList = document.querySelectorAll(selector); var galleryNodeList = QSA(selector);
var selectorData = { var selectorData = {
galleries: [], galleries: [],
nodeList: galleryNodeList nodeList: galleryNodeList
@ -491,7 +491,7 @@ window.baguetteBox = (function () {
image.addEventListener(is_vid ? 'loadedmetadata' : 'load', function () { image.addEventListener(is_vid ? 'loadedmetadata' : 'load', function () {
// Remove loader element // Remove loader element
var spinner = document.querySelector('#baguette-img-' + index + ' .bbox-spinner'); var spinner = QS('#baguette-img-' + index + ' .bbox-spinner');
figure.removeChild(spinner); figure.removeChild(spinner);
if (!options.async && callback) if (!options.async && callback)
callback(); callback();

View file

@ -605,7 +605,7 @@ var widget = (function () {
m += '[' + cv + s2ms(mp.au.currentTime) + ck + '/' + cv + s2ms(mp.au.duration) + ck + ']'; 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.style.cssText = 'position:fixed;top:45%;left:48%;padding:1em;z-index:9';
o.value = m; o.value = m;
document.body.appendChild(o); document.body.appendChild(o);
@ -1451,7 +1451,7 @@ function play_linked() {
var thegrid = (function () { var thegrid = (function () {
var lfiles = ebi('files'), var lfiles = ebi('files'),
gfiles = document.createElement('div'); gfiles = mknod('div');
gfiles.setAttribute('id', 'gfiles'); gfiles.setAttribute('id', 'gfiles');
gfiles.style.display = 'none'; gfiles.style.display = 'none';
@ -1553,7 +1553,7 @@ var thegrid = (function () {
setsz(); setsz();
function gclick(e) { function gclick(e) {
if (e && (e.ctrlKey || e.metaKey)) if (ctrl(e))
return true; return true;
var oth = ebi(this.getAttribute('ref')), var oth = ebi(this.getAttribute('ref')),
@ -2301,7 +2301,7 @@ var treectl = (function () {
} }
function treego(e) { function treego(e) {
if (e && (e.ctrlKey || e.metaKey)) if (ctrl(e))
return true; return true;
ev(e); ev(e);

View file

@ -925,9 +925,8 @@ function cfg_uni(e) {
function keydown(ev) { function keydown(ev) {
ev = ev || window.event; ev = ev || window.event;
var kc = ev.keyCode || ev.which; var kc = ev.keyCode || ev.which;
var ctrl = ev.ctrlKey || ev.metaKey;
//console.log(ev.code, kc); //console.log(ev.code, kc);
if (ctrl && (ev.code == "KeyS" || kc == 83)) { if (ctrl(ev) && (ev.code == "KeyS" || kc == 83)) {
save(); save();
return false; return false;
} }
@ -936,23 +935,15 @@ function cfg_uni(e) {
if (d) if (d)
d.click(); d.click();
} }
if (document.activeElement == dom_src) { if (document.activeElement != dom_src)
if (ev.code == "Tab" || kc == 9) { return true;
md_indent(ev.shiftKey);
return false; if (ctrl(ev)) {
} if (ev.code == "KeyH" || kc == 72) {
if (ctrl && (ev.code == "KeyH" || kc == 72)) {
md_header(ev.shiftKey); md_header(ev.shiftKey);
return false; return false;
} }
if (!ctrl && (ev.code == "Home" || kc == 36)) { if (ev.code == "KeyZ" || kc == 90) {
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.shiftKey) if (ev.shiftKey)
action_stack.redo(); action_stack.redo();
else else
@ -960,33 +951,45 @@ function cfg_uni(e) {
return false; return false;
} }
if (ctrl && (ev.code == "KeyY" || kc == 89)) { if (ev.code == "KeyY" || kc == 89) {
action_stack.redo(); action_stack.redo();
return false; return false;
} }
if (!ctrl && !ev.shiftKey && kc == 8) { if (ev.code == "KeyK") {
return md_backspace();
}
if (ctrl && (ev.code == "KeyK")) {
fmt_table(); fmt_table();
return false; return false;
} }
if (ctrl && (ev.code == "KeyU")) { if (ev.code == "KeyU") {
iter_uni(); iter_uni();
return false; return false;
} }
if (ctrl && (ev.code == "KeyE")) { if (ev.code == "KeyE") {
dom_nsbs.click(); dom_nsbs.click();
//fmt_table();
return false; return false;
} }
var up = ev.code == "ArrowUp" || kc == 38; var up = ev.code == "ArrowUp" || kc == 38;
var dn = ev.code == "ArrowDown" || kc == 40; var dn = ev.code == "ArrowDown" || kc == 40;
if (ctrl && (up || dn)) { if (up || dn) {
md_p_jump(dn); md_p_jump(dn);
return false; 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; document.onkeydown = keydown;
ebi('save').onclick = save; ebi('save').onclick = save;