minor code cleanup

diff --git a/editor.js b/editor.js
index 8fc031b6c5e02e41059158d3aaffca1479f95b3a..1b236e07c0742289a32966c11d349503ed81e367 100644 (file)
--- a/editor.js
+++ b/editor.js
@@ -22,9 +22,8 @@
                if (!!force) document.title = "", ls.clear();
 
                if (doc.title === "") {
-                       content.innerHTML = !!ls['content'] ? ls['content'] : "<p>&nbsp;</p>";
-                       header.innerHTML = !!ls['header'] ? ls['header']
-                                        : '<h1 align="center" contenteditable="true">' + ymd_string() + '</h1><hr/>' ;
+                       content.innerHTML = ls['content'] || '<p>&nbsp;</p>';
+                       header.innerHTML = ls['header'] || '<h1 align="center" contenteditable="true">' + ymd_string() + '</h1><hr/>' ;
                        doc.title = header.innerText;
                }
 
@@ -40,7 +39,7 @@
 
        const ctrlHeld = (ev) => (ev.ctrlKey || ev.metaKey);
        const inTag = (tag) => (getSelNode().nodeName === tag);
-       const keyCmd = (ev, cmd, arg) => (ctrlHeld(ev) ? !doc.exec(cmd, false, arg) : true);
+       const keyCmd = (ev, cmd, arg) => !(ctrlHeld(ev) && doc.exec(cmd, false, arg));
        const reinit = (ev) => {
                if (ctrlHeld(ev)) {
                        initialize(true);

diff --git a/index.html b/index.html
index 93219d1e0c426093b6ac8d9433ff0e8faa3e7f24..e7761f6913944065ca176952ddf55b213c5b4566 100644 (file)
--- a/index.html
+++ b/index.html
@@ -104,9 +104,8 @@ th:first-child, td:first-child {
                if (!!force) document.title = "", ls.clear();
 
                if (doc.title === "") {
-                       content.innerHTML = !!ls['content'] ? ls['content'] : "<p>&nbsp;</p>";
-                       header.innerHTML = !!ls['header'] ? ls['header']
-                                        : '<h1 align="center" contenteditable="true">' + ymd_string() + '</h1><hr/>' ;
+                       content.innerHTML = ls['content'] || '<p>&nbsp;</p>';
+                       header.innerHTML = ls['header'] || '<h1 align="center" contenteditable="true">' + ymd_string() + '</h1><hr/>' ;
                        doc.title = header.innerText;
                }
 
@@ -122,7 +121,7 @@ th:first-child, td:first-child {
 
        const ctrlHeld = (ev) => (ev.ctrlKey || ev.metaKey);
        const inTag = (tag) => (getSelNode().nodeName === tag);
-       const keyCmd = (ev, cmd, arg) => (ctrlHeld(ev) ? !doc.exec(cmd, false, arg) : true);
+       const keyCmd = (ev, cmd, arg) => !(ctrlHeld(ev) && doc.exec(cmd, false, arg)); //!ctrlHeld(ev) || !doc.exec(cmd, false, arg);
        const reinit = (ev) => {
                if (ctrlHeld(ev)) {
                        initialize(true);