Sort settings

Author: madprops

js/main/commands.js

@@ -12,28 +12,41 @@ App.update_command_history = (cmd) => {
 }
 
 App.sort_commands = () => {
-  App.sorted_commands = App.commands.slice(0)
+  function sort(what) {
+    let items = `command_${what}_items`
+    App[items] = App.commands.slice(0)
+    let setting = App.get_setting(`command_${what}_sort`)
 
-  if (!App.get_setting(`sort_commands`)) {
-    return
-  }
+    if (setting === `none`) {
+      // Do nothing
+    }
+    else if (setting === `recent`) {
+      App[items].sort((a, b) => {
+        let ia = App.command_history.indexOf(a.cmd)
+        let ib = App.command_history.indexOf(b.cmd)
 
-  App.sorted_commands.sort((a, b) => {
-    let ia = App.command_history.indexOf(a.cmd)
-    let ib = App.command_history.indexOf(b.cmd)
+        if ((ia !== -1) && (ib !== -1)) {
+          return ia - ib
+        }
 
-    if ((ia !== -1) && (ib !== -1)) {
-      return ia - ib
-    }
+        if (ia !== -1) {
+          return -1
+        }
 
-    if (ia !== -1) {
-      return -1
+        if (ib !== -1) {
+          return 1
+        }
+      })
     }
-
-    if (ib !== -1) {
-      return 1
+    else if (setting === `alpha`) {
+      App[items].sort((a, b) => {
+        return a.name.localeCompare(b.name)
+      })
     }
-  })
+  }
+
+  sort(`palette`)
+  sort(`menu`)
 }
 
 App.get_command = (cmd) => {

js/main/filter.js

@@ -973,10 +973,10 @@ App.do_filter_2 = (mode) => {
     }
     else {
       show = text.includes(value)
-    }
 
-    if (!show && tooltip) {
-      show = tooltip.includes(value)
+      if (!show && tooltip) {
+        show = tooltip.includes(value)
+      }
     }
 
     if (show) {

js/main/palette.js

@@ -175,7 +175,7 @@ App.fill_palette = () => {
   container.innerHTML = ``
   let num = 0
 
-  for (let cmd of App.sorted_commands) {
+  for (let cmd of App.command_palette_items) {
     if (cmd.skip_palette) {
       continue
     }

js/main/setting_props.js

@@ -257,6 +257,36 @@ App.build_settings = () => {
         })
       },
     },
+    command_palette_sort: {
+      name: `Command Palette Sort`,
+      type: `menu`,
+      value: `recent`,
+      setup: (key) => {
+        App.settings_make_menu(key, [
+          {text: `None`, value: `none`},
+          {text: `Recent`, value: `recent`},
+          {text: `Alpha`, value: `alpha`},
+        ])
+      },
+      actions: [`commands`],
+      info: `How to sort the command palette`,
+      version: 1,
+    },
+    command_menu_sort: {
+      name: `Command Menu Sort`,
+      type: `menu`,
+      value: `none`,
+      setup: (key) => {
+        App.settings_make_menu(key, [
+          {text: `None`, value: `none`},
+          {text: `Recent`, value: `recent`},
+          {text: `Alpha`, value: `alpha`},
+        ])
+      },
+      actions: [`commands`],
+      info: `How to sort the command menus`,
+      version: 1,
+    },
     tooltips_mode: {
       name: `Tooltips Mode`,
       type: `menu`,
@@ -272,6 +302,7 @@ App.build_settings = () => {
           {text: `Arrows`, value: `arrows`},
         ])
       },
+      actions: [`commands`],
       info: `How to present the tooltips of items`,
       version: 1,
     },
@@ -5199,13 +5230,6 @@ App.build_settings = () => {
       info: `Allow rounded corners in some parts of the interface`,
       version: 1,
     },
-    sort_commands: {
-      name: `Sort Commands`,
-      type: `checkbox`,
-      value: true,
-      info: `Sort commands in the Palette by recent use`,
-      version: 1,
-    },
     check_commands: {
       name: `Check Commands`,
       type: `checkbox`,

js/main/settings.js

@@ -10,6 +10,7 @@ App.settings_do_actions = (actions) => {
     else if (action === `commands`) {
       App.setup_commands()
       App.build_setting_cmds()
+      App.fill_palette()
     }
     else if (action === `filters`) {
       App.start_filter_debouncers()
@@ -1096,7 +1097,7 @@ App.settings_commands = (include_none, include_sep) => {
 
   App.add_setting_headers(items, include_none, include_sep)
 
-  for (let cmd of App.commands) {
+  for (let cmd of App.command_menu_items) {
     if (cmd.skip_settings) {
       continue
     }