From 169551c6a89b6c37f4303ce5eaabab927fa4594f Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sat, 9 Nov 2019 20:59:49 +0100
Subject: [PATCH] note revisions as a bootstrap list instead of <select>

---
 .../javascripts/dialogs/note_revisions.js     | 58 ++++++++++++++-----
 src/public/stylesheets/style.css              |  5 ++
 src/views/dialogs/note_revisions.ejs          | 15 +++--
 3 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/src/public/javascripts/dialogs/note_revisions.js b/src/public/javascripts/dialogs/note_revisions.js
index aa7b26053..952ec04d4 100644
--- a/src/public/javascripts/dialogs/note_revisions.js
+++ b/src/public/javascripts/dialogs/note_revisions.js
@@ -5,13 +5,24 @@ import toastService from "../services/toast.js";
 
 const $dialog = $("#note-revisions-dialog");
 const $list = $("#note-revision-list");
+const $listDropdown = $("#note-revision-list-dropdown");
 const $content = $("#note-revision-content");
 const $title = $("#note-revision-title");
 const $titleButtons = $("#note-revision-title-buttons");
 const $eraseAllRevisionsButton = $("#note-revisions-erase-all-revisions-button");
 
+$listDropdown.dropdown();
+
+$listDropdown.parent().on('hide.bs.dropdown', e => {
+    // prevent closing dropdown by clicking outside
+    if (e.clickEvent) {
+        e.preventDefault();
+    }
+});
+
 let revisionItems = [];
 let note;
+let noteRevisionId;
 
 export async function showCurrentNoteRevisions() {
     await showNoteRevisionsDialog(noteDetailService.getActiveTabNoteId());
@@ -27,7 +38,7 @@ export async function showNoteRevisionsDialog(noteId, noteRevisionId) {
     await loadNoteRevisions(noteId, noteRevisionId);
 }
 
-async function loadNoteRevisions(noteId, noteRevisionId) {
+async function loadNoteRevisions(noteId, noteRevId) {
     $list.empty();
     $content.empty();
 
@@ -35,27 +46,34 @@ async function loadNoteRevisions(noteId, noteRevisionId) {
     revisionItems = await server.get(`notes/${noteId}/revisions`);
 
     for (const item of revisionItems) {
-        $list.append($('<option>', {
-            value: item.noteRevisionId,
-            text: item.dateLastEdited.substr(0, 16) + ` (${item.contentLength} bytes)`
-        }));
+        $list.append($('<a class="dropdown-item" tabindex="0">')
+            .text(item.dateLastEdited.substr(0, 16) + ` (${item.contentLength} bytes)`)
+            .attr('data-note-revision-id', item.noteRevisionId));
     }
 
+    $listDropdown.dropdown('show');
+
+    noteRevisionId = noteRevId;
+
     if (revisionItems.length > 0) {
         if (!noteRevisionId) {
-            noteRevisionId = $list.find("option:first").val();
+            noteRevisionId = revisionItems[0].noteRevisionId;
         }
-
-        $list.val(noteRevisionId).trigger('change');
     } else {
         $title.text("No revisions for this note yet...");
+        noteRevisionId = null;
     }
 }
 
-$list.on('change', async () => {
-    const optVal = $list.find(":selected").val();
+$dialog.on('shown.bs.modal', () => {
+    $list.find(`[data-note-revision-id="${noteRevisionId}"]`)
+        .trigger('focus');
+});
 
-    const revisionItem = revisionItems.find(r => r.noteRevisionId === optVal);
+async function setContentPane() {
+    const noteRevisionId = $list.find(".active").attr('data-note-revision-id');
+
+    const revisionItem = revisionItems.find(r => r.noteRevisionId === noteRevisionId);
 
     $titleButtons.empty();
     $content.empty();
@@ -102,7 +120,8 @@ $list.on('change', async () => {
             // reason why we put this inline as base64 is that we do not want to let user to copy this
             // as a URL to be used in a note. Instead if they copy and paste it into a note, it will be a uploaded as a new note
             .attr("src", `data:${note.mime};base64,` + fullNoteRevision.content)
-            .css("width", "100%"));
+            .css("max-width", "100%")
+            .css("max-height", "100%"));
     }
     else if (revisionItem.type === 'file') {
         const $table = $("<table cellpadding='10'>")
@@ -130,7 +149,7 @@ $list.on('change', async () => {
     else {
         $content.text("Preview isn't available for this note type.");
     }
-});
+}
 
 $eraseAllRevisionsButton.on('click', async () => {
     const confirmDialog = await import('../dialogs/confirm.js');
@@ -143,4 +162,17 @@ $eraseAllRevisionsButton.on('click', async () => {
 
         toastService.showMessage('Note revisions has been deleted.');
     }
+});
+
+$list.on('click', '.dropdown-item', e => {
+   e.preventDefault();
+   return false;
+});
+
+$list.on('focus', '.dropdown-item', e => {
+    $list.find('.dropdown-item').each((i, el) => {
+        $(el).toggleClass('active', el === e.target);
+    });
+
+    setContentPane();
 });
\ No newline at end of file
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 16c97fb63..077c38f92 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -351,6 +351,11 @@ div.ui-tooltip {
     color: #aaa !important;
 }
 
+.dropdown-item.active {
+    color: var(--active-item-text-color) !important;
+    background-color: var(--active-item-background-color) !important;
+}
+
 .note-detail-code {
     overflow: auto;
 }
diff --git a/src/views/dialogs/note_revisions.ejs b/src/views/dialogs/note_revisions.ejs
index c3acb367b..a790f566c 100644
--- a/src/views/dialogs/note_revisions.ejs
+++ b/src/views/dialogs/note_revisions.ejs
@@ -15,18 +15,21 @@
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
-            <div class="modal-body" style="display: flex;">
-                <select id="note-revision-list" size="25" style="min-width: 230px; height: 630px;">
-                </select>
+            <div class="modal-body" style="display: flex; height: 80vh;">
+                <div class="dropdown">
+                    <button id="note-revision-list-dropdown" type="button" style="display: none;" data-toggle="dropdown">Dropdown trigger</button>
 
-                <div id="note-revision-content-wrapper" style="flex-grow: 1; margin-left: 20px;">
-                    <div style="display: flex; justify-content: space-between;">
+                    <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 style="flex-grow: 0; display: flex; justify-content: space-between;">
                         <h3 id="note-revision-title" style="margin: 3px; flex-grow: 100;"></h3>
 
                         <div id="note-revision-title-buttons"></div>
                     </div>
 
-                    <div id="note-revision-content" style="height: 600px; overflow: auto;"></div>
+                    <div id="note-revision-content" style="overflow: auto;"></div>
                 </div>
             </div>
         </div>