From a14257a31c02ccbe4ba73840f62c7ff10ebdf087 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Sat, 23 Sep 2017 10:18:08 -0400
Subject: [PATCH] basic functionality of history now working

---
 src/notes_api.py          |  2 +-
 src/templates/app.html    |  7 +++++--
 static/js/init.js         | 16 ++++++++--------
 static/js/note_history.js | 28 ++++++++++++++++++++++------
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/notes_api.py b/src/notes_api.py
index 8cec03f13..1e80eef58 100644
--- a/src/notes_api.py
+++ b/src/notes_api.py
@@ -44,7 +44,7 @@ def updateNote(note_id):
 
     now = math.floor(time.time())
 
-    history_cutoff = now - 3600
+    history_cutoff = now - 600
 
     history = getSingleResult("select id from notes_history where note_id = ? and date_modified >= ?", [note_id, history_cutoff])
 
diff --git a/src/templates/app.html b/src/templates/app.html
index d5d5100af..83aa89f31 100644
--- a/src/templates/app.html
+++ b/src/templates/app.html
@@ -173,10 +173,13 @@
 
     <div id="noteHistoryDialog" title="Note history" style="display: none;">
       <div style="display: flex;">
-        <select id="noteHistoryList" size="25" style="flex-grow: 1;">
+        <select id="noteHistoryList" size="25" style="flex-grow: 1; height: 630px;">
         </select>
 
-        <div id="noteHistoryContent" style="flex-grow: 3;">
+        <div id="noteHistoryContentWrapper" style="flex-grow: 3; margin-left: 20px;">
+          <h1 id="noteHistoryTitle" style="margin-top: 5px;"></h1>
+
+          <div id="noteHistoryContent"></div>
         </div>
       </div>
     </div>
diff --git a/static/js/init.js b/static/js/init.js
index 715d4ffa9..0338643ae 100644
--- a/static/js/init.js
+++ b/static/js/init.js
@@ -20,14 +20,14 @@ $(function() {
 jQuery.hotkeys.options.filterInputAcceptingElements = true;
 jQuery.hotkeys.options.filterContentEditable = true;
 
-// $(document).bind('keydown', 'alt+h', function() {
-//     const toggle = $(".hide-toggle");
-//     const hidden = toggle.css('display') === 'none';
-//
-//     toggle.css('display', hidden ? 'block' : 'none');
-//
-//     $("#noteDetailWrapper").css("width", hidden ? "750px" : "100%");
-// });
+$(document).bind('keydown', 'alt+m', function() {
+    const toggle = $(".hide-toggle");
+    const hidden = toggle.css('display') === 'none';
+
+    toggle.css('display', hidden ? 'block' : 'none');
+
+    $("#noteDetailWrapper").css("width", hidden ? "750px" : "100%");
+});
 
 $(document).bind('keydown', 'alt+s', function() {
     $("input[name=search]").focus();
diff --git a/static/js/note_history.js b/static/js/note_history.js
index 93e545e24..9e022d0ae 100644
--- a/static/js/note_history.js
+++ b/static/js/note_history.js
@@ -1,3 +1,5 @@
+let globalHistoryItems = null;
+
 $(document).bind('keydown', 'alt+h', function() {
     $("#noteHistoryDialog").dialog({
         modal: true,
@@ -12,17 +14,31 @@ $(document).bind('keydown', 'alt+h', function() {
         url: baseUrl + 'notes-history/' + globalCurrentNote.detail.note_id,
         type: 'GET',
         success: function (result) {
-            if (result.length > 0) {
-                $("#noteHistoryContent").html(result[0]["note_text"]);
+            globalHistoryItems = result;
+
+            for (const row of result) {
+                const dateModified = new Date(row.date_modified * 1000);
+
+                $("#noteHistoryList").append($('<option>', {
+                    value: row.id,
+                    text: formatDate(dateModified)
+                }));
             }
 
-            for (row of result) {
-                const dateModified = new Date(row['date_modified'] * 1000);
-                const optionHtml = '<option value="' + row['note_id'] + '">' + formatDate(dateModified) + '</option>';
+            if (result.length > 0) {
+                const firstOptionValue = $("#noteHistoryList option:first").val();
 
-                $("#noteHistoryList").append(optionHtml);
+                $("#noteHistoryList").val(firstOptionValue).trigger('change');
             }
         },
         error: () => alert("Error getting note history.")
     });
+});
+
+$("#noteHistoryList").on('change', () => {
+    const optVal = $("#noteHistoryList").find(":selected").val();
+    const historyItem = globalHistoryItems.find(r => r.id == optVal); // non-strict comparison is important here!!!s
+
+    $("#noteHistoryTitle").html(historyItem.note_title);
+    $("#noteHistoryContent").html(historyItem.note_text);
 });
\ No newline at end of file