From 35fc4ba9a41cd6e0553a39380a9b050d947effb9 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Thu, 28 Oct 2021 20:38:35 +0200
Subject: [PATCH] fix wrapping of code blocks in note revisions, #2216

---
 package-lock.json                    | 12 ++++++------
 package.json                         |  2 +-
 src/views/dialogs/note_revisions.ejs | 16 +++++++++++++++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6f8a27ad7..6f2117bcc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2850,9 +2850,9 @@
       }
     },
     "electron": {
-      "version": "13.6.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-13.6.0.tgz",
-      "integrity": "sha512-VDOUmRwa4eQ+5iXE+XHKXKX+2yk8Ey5uBe3nH9Hj6zNPUBY2S0EOClw7U90Ve2lLHXiQ6DnguNmDgOZKJLcHFQ==",
+      "version": "13.6.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-13.6.1.tgz",
+      "integrity": "sha512-rZ6Y7RberigruefQpWOiI4bA9ppyT88GQF8htY6N1MrAgal5RrBc+Mh92CcGU7zT9QO+XO3DarSgZafNTepffQ==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -2861,9 +2861,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "14.17.27",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.27.tgz",
-          "integrity": "sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw==",
+          "version": "14.17.32",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz",
+          "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==",
           "dev": true
         }
       }
diff --git a/package.json b/package.json
index eea3f94d0..e703e83cb 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.3",
-    "electron": "13.6.0",
+    "electron": "13.6.1",
     "electron-builder": "22.13.1",
     "electron-packager": "15.4.0",
     "electron-rebuild": "3.2.3",
diff --git a/src/views/dialogs/note_revisions.ejs b/src/views/dialogs/note_revisions.ejs
index 8eb73ef68..9462a7d9c 100644
--- a/src/views/dialogs/note_revisions.ejs
+++ b/src/views/dialogs/note_revisions.ejs
@@ -1,5 +1,13 @@
 <div id="note-revisions-dialog" class="modal fade mx-auto" tabindex="-1" role="dialog">
     <style>
+        #note-revision-content-wrapper {
+            flex-grow: 1;
+            margin-left: 20px;
+            display: flex;
+            flex-direction: column;
+            min-width: 0;
+        }
+
         #note-revision-content {
             overflow: auto;
             word-break: break-word;
@@ -9,6 +17,12 @@
             max-width: 100%;
             object-fit: contain;
         }
+
+        #note-revision-content pre {
+            max-width: 100%;
+            word-break: break-all;
+            white-space: pre-wrap;
+        }
     </style>
 
     <div class="modal-dialog modal-xl" role="document">
@@ -34,7 +48,7 @@
                     <div id="note-revision-list" style="position: static; height: 100%; overflow: auto;" class="dropdown-menu"></div>
                 </div>
 
-                <div id="note-revision-content-wrapper" style="flex-grow: 1; margin-left: 20px; display: flex; flex-direction: column;">
+                <div id="note-revision-content-wrapper">
                     <div style="flex-grow: 0; display: flex; justify-content: space-between;">
                         <h3 id="note-revision-title" style="margin: 3px; flex-grow: 100;"></h3>