From 4a4228cd0355e8e486b18a57b0b9f0f306779bae Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Wed, 11 Oct 2017 19:41:45 -0400
Subject: [PATCH] making dialogs wider to accompany deeper hierarchies. Recent
 changes now display full path of the note

---
 src/templates/app.html      |  2 +-
 static/js/jump_to_note.js   |  2 +-
 static/js/recent_changes.js | 14 ++++++--------
 static/js/recent_notes.js   |  2 +-
 static/js/tree_utils.js     |  4 ++++
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/templates/app.html b/src/templates/app.html
index a6a2e567a..ed3bdf2c2 100644
--- a/src/templates/app.html
+++ b/src/templates/app.html
@@ -91,7 +91,7 @@
     </div>
 
     <div id="recent-notes-dialog" title="Recent notes" style="display: none;">
-      <select id="recent-notes-select-box" size="15" style="width: 100%">
+      <select id="recent-notes-select-box" size="20" style="width: 100%">
       </select>
 
       <br/><br/>
diff --git a/static/js/jump_to_note.js b/static/js/jump_to_note.js
index 7ae8d92a0..59e2dc8e6 100644
--- a/static/js/jump_to_note.js
+++ b/static/js/jump_to_note.js
@@ -3,7 +3,7 @@ function showJumpToNote() {
 
     $("#jump-to-note-dialog").dialog({
         modal: true,
-        width: 500
+        width: 800
     });
 
     $("#jump-to-note-autocomplete").autocomplete({
diff --git a/static/js/recent_changes.js b/static/js/recent_changes.js
index cfef4c7f9..b1552598f 100644
--- a/static/js/recent_changes.js
+++ b/static/js/recent_changes.js
@@ -1,7 +1,7 @@
 function showRecentChanges() {
     $("#recent-changes-dialog").dialog({
         modal: true,
-        width: 400,
+        width: 800,
         height: 700
     });
 
@@ -13,13 +13,11 @@ function showRecentChanges() {
             const dayCache = {};
 
             for (const row of result) {
-                if (row.encryption > 0) {
-                    if (isEncryptionAvailable()) {
-                        row.note_title = decryptString(row.note_title);
-                    }
-                    else {
-                        row.note_title = "[encrypted]";
-                    }
+                if (row.encryption > 0 && !isEncryptionAvailable()) {
+                    row.note_title = "[encrypted]";
+                }
+                else {
+                    row.note_title = getFullName(row.note_id);
                 }
 
 
diff --git a/static/js/recent_notes.js b/static/js/recent_notes.js
index c1862675c..7506c2d85 100644
--- a/static/js/recent_notes.js
+++ b/static/js/recent_notes.js
@@ -17,7 +17,7 @@ function showRecentNotes() {
 
     $("#recent-notes-dialog").dialog({
         modal: true,
-        width: 500
+        width: 800
     });
 
     let recentNotesSelectBox = $('#recent-notes-select-box');
diff --git a/static/js/tree_utils.js b/static/js/tree_utils.js
index a8af4d0c4..2b419125f 100644
--- a/static/js/tree_utils.js
+++ b/static/js/tree_utils.js
@@ -28,6 +28,10 @@ function getNoteTitle(noteId) {
 function getFullName(noteId) {
     let note = getNodeByKey(noteId);
 
+    if (note === null) {
+        return "[unknown]";
+    }
+
     if (note.data.is_clone || (note.data.encryption > 0 && !isEncryptionAvailable())) {
         return null;
     }