From 36f920b97500abef04ba180afc0d47abc9aafd62 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Sat, 13 Jan 2018 23:03:17 -0500
Subject: [PATCH] alt+s is now shortcut for sorting, search is not triggered
 with ctrl+s

---
 plugins/reddit.js                  | 6 +-----
 public/javascripts/context_menu.js | 2 +-
 public/javascripts/note_tree.js    | 5 +++++
 public/javascripts/search_tree.js  | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/reddit.js b/plugins/reddit.js
index 149077ec7..79394dbe0 100644
--- a/plugins/reddit.js
+++ b/plugins/reddit.js
@@ -189,8 +189,6 @@ async function runImport() {
         let importedComments = 0;
 
         for (const account of redditAccounts) {
-            log.info("Reddit: Importing account " + account);
-
             importedComments += await importComments(account);
         }
 
@@ -199,9 +197,7 @@ async function runImport() {
 }
 
 sql.dbReady.then(async () => {
-    console.log(config);
-
-    if (!config['Reddit'] || !config['Reddit']['enabled'] !== true) {
+    if (!config['Reddit'] || config['Reddit']['enabled'] !== true) {
         return;
     }
 
diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 981bd8fa3..7f6859958 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -91,7 +91,7 @@ const contextMenu = (function() {
             {title: "----"},
             {title: "Collapse sub-tree <kbd>Alt+-</kbd>", cmd: "collapse-sub-tree", uiIcon: "ui-icon-minus"},
             {title: "Force note sync", cmd: "force-note-sync", uiIcon: "ui-icon-refresh"},
-            {title: "Sort alphabetically", cmd: "sort-alphabetically", uiIcon: " ui-icon-arrowthick-2-n-s"}
+            {title: "Sort alphabetically <kbd>Alt+s</kbd>", cmd: "sort-alphabetically", uiIcon: " ui-icon-arrowthick-2-n-s"}
 
         ],
         beforeOpen: (event, ui) => {
diff --git a/public/javascripts/note_tree.js b/public/javascripts/note_tree.js
index 834b6895c..c4f39fe23 100644
--- a/public/javascripts/note_tree.js
+++ b/public/javascripts/note_tree.js
@@ -468,6 +468,11 @@ const noteTree = (function() {
             "alt+-": node => {
                 collapseTree(node);
             },
+            "alt+s": node => {
+                sortAlphabetically(node.data.note_id);
+
+                return false;
+            },
             "ctrl+a": node => {
                 for (const child of node.getParent().getChildren()) {
                     child.setSelected(true);
diff --git a/public/javascripts/search_tree.js b/public/javascripts/search_tree.js
index fe4b13442..976a48025 100644
--- a/public/javascripts/search_tree.js
+++ b/public/javascripts/search_tree.js
@@ -48,7 +48,7 @@ const searchTree = (function() {
         }
     }).focus();
 
-    $(document).bind('keydown', 'alt+s', e => {
+    $(document).bind('keydown', 'ctrl+s', e => {
         toggleSearch();
 
         e.preventDefault();