From 8f615bc2197ec0bb14d04183424277fe8f143448 Mon Sep 17 00:00:00 2001
From: Nicolas Sanchez <sanchezn@gmail.com>
Date: Thu, 9 Mar 2023 19:10:09 +0100
Subject: [PATCH] correction affichage

---
 db/db.sqlite3                 | Bin 106496 -> 114688 bytes
 src/commons.rs                |   3 +++
 src/main.rs                   |   3 ++-
 static/cheezenotes.css        |   9 +++++----
 static/modules/cheezenotes.js |  27 +++++++++++----------------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/db/db.sqlite3 b/db/db.sqlite3
index d4757bc0f04f5e94789a1e392bbbfd9c36c083df..9a67e74a6ca8407d5d9b5354687aa1668c21e1d0 100644
GIT binary patch
delta 4789
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

delta 932
zcmZvaVQdp+7{}k|-n;9)*Sp^6=zz^-XF8;~9dlVy1Qpp9f*_I+1|b8Nw%4;BYkRc4
zC71~9joA@E;ZpDtH)fb0_yWl;$2_eunel^Bqlwuk5)dVPQ4F8tgYko&X2!&rJo$b2
zzyIX<zyCb7TBx?nUTSC21B6h!E$^Vv12?rG@r$TUIv;4Ly&<%049!VPk}aKgO9PZQ
z5siqAH(reP1+N>dLjl)Y$$;xp0b11nZGVZey#b;x1z?N-YmG*;Yj-FdM#s1+ZgBG6
ztoV)C6c<EWx+s>VBVtC}&p#))f)noKKI3kQ&vI31h`TKHh;cC@{1k2>-;!niJN_Ym
zi$6$y;SqORdd$Dc4~G%qiOgsD&169OfL|c*lZzxr7RgC6;w{VfSiAOfqnglS=uQ-G
zqJ~C>cPR(=DEkdltDp}Xza_R$h`0+1dQn$$M*g+&2!0ZV%DQUg(>bm3Y8&o{6I!`q
zD5jRzRHINx7qeQX1#euHbGrHZWaj9<zJgIS6unq6)A{_EgyX9|wQN)>-u&hPpf}*H
z;QZJRF)$hrpO&N2UBnCtxPwZo>ZGRU(G9P&=Q7Z1u>#&w?<0!l@jA-8-Zxg0f;MSb
zK|+lmWgo$cTlyTl6}N-Ib#;sXjtyDt9ctdt#K4E?Bw}ZoCY^Lk3EEF~!!%%PJmXwC
z3E%s(Pk~N&fZHe-M80xMUjv@&HvBu+AQ8Dv?*zGx!*zt~!UVY=YOwd&BK;mcK>cnH
zKH(=*Foh|EoTdst&}R;eGyZ%Q9#i!6zA?ska&Vk$71kq$N+ID>;cEB-IYOnVlwIm|
zb}qsuXNL{@yt~nxK)-ETNniLFer1{IXRIxZS9qb1Vl2+;Wt=}UFvA5ud5eizr<~4t
zIOSh`9&$K>LrX}UB7SIz8m2njl0Yemo_;c#E}NR1o|IMHEE~nR{2zf2?y<~tTsh!$
z*)S38zeYQ~RXDsR9+w9v&9Zjpv^B~M&b&;Vkt($NhtI)1pl5bld;Dz|;0x?`ZHLoT
z<nMCXvq*S1)XkoCOP@e%WZTw{c9F~pRZ}Xug3xM_v-FxE{!Jz}^$H0N&OAD(s*X~J
VIqqE1I`%(FxPOxPU)JF`{u5LP4F&)J

diff --git a/src/commons.rs b/src/commons.rs
index da976af..041edc2 100644
--- a/src/commons.rs
+++ b/src/commons.rs
@@ -13,6 +13,9 @@ pub struct Arguments {
     /// root of the url ending and starting with /
     #[arg(short, long, default_value_t = String::from("/"))]
     pub root: String,
+    /// sqlite database path
+    #[arg(short, long, default_value_t = String::from("db/db.sqlite3"))]
+    pub db: String,
 }
 
 impl Arguments {
diff --git a/src/main.rs b/src/main.rs
index bbaf1ee..2e13a9a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,8 +15,9 @@ async fn main() -> std::io::Result<()> {
     let ip = args.ip;
     let port = args.port;
     let root = args.root;
+    let db = args.db;
 
-    let manager = SqliteConnectionManager::file("db/db.sqlite3");
+    let manager = SqliteConnectionManager::file(db);
     let pool = Pool::new(manager).unwrap();
 
     let appdata = AppData {
diff --git a/static/cheezenotes.css b/static/cheezenotes.css
index 1f0cacc..a200c02 100644
--- a/static/cheezenotes.css
+++ b/static/cheezenotes.css
@@ -321,15 +321,16 @@ div#cheezenotes div.lasttablerow span.tablerow {
 
 div#cheezenotes div.cheezenotes_line span.token {
   font-weight: 1;
-  color: #1353b3;
+  color: transparent;
   overflow: hidden;
-}
-
-div#cheezenotes div.cheezenotes_line span.token {
   font-size: 0;
+  vertical-align: baseline;
+  transition-property: font-size, color;
+  transition-duration: .2s;
 }
 
 div#cheezenotes:focus div.cheezenotes_line span.token {
+  color: #1353b3;
   font-size: 95%;
 }
 
diff --git a/static/modules/cheezenotes.js b/static/modules/cheezenotes.js
index 3778801..775f0a3 100644
--- a/static/modules/cheezenotes.js
+++ b/static/modules/cheezenotes.js
@@ -215,19 +215,6 @@ function oncopy(e) {
     //alert(e.clipboardData.getData('text/plain'));
 }
 
-function onlockbutton(e) {
-    let lockButton = document.getElementById('lockButton');
-    let lockButtonLabel = document.getElementById('lockButtonLabel');
-    let cheezenotes = document.getElementById('cheezenotes');
-    if (lockButton.checked) {
-        cheezenotes.contentEditable = false;
-        lockButtonLabel.innerText = 'visibility';
-    } else {
-        cheezenotes.contentEditable = true;
-        lockButtonLabel.innerText = 'visibility_off';
-    }
-}
-
 function ondrag(e) {
     // alert('drag');
 }
@@ -323,13 +310,21 @@ function onblur(e) {
     let cheezenotes = document.getElementById('cheezenotes');
     redrawTables(cheezenotes);
     onsave();
-    hideTokens();
+    // hideTokens();
     disableFormatButtons();
 }
 
-function onfocus() {
+function onfocus(e) {
+    let editModeButton = document.getElementById('editModeButton');
+    if (editModeButton.classList.contains('buttonoff')) {
+        e.preventDefault();
+        let cheezenotes = document.getElementById('cheezenotes');
+        cheezenotes.contentEditable = false;
+        cheezenotes.blur();
+        return false;
+    }
     redrawTables(cheezenotes, dpwidth());
-    showTokens();
+    // showTokens();
     enableFormatButtons();
 }