Release v1.6.1

Fix #57.

Squashed commit of the following:

commit d10eca3
Author: John Dunning <fw@johndunning.com>
Date:   Tue May 4 15:54:50 2021 -0700

    Update version to 1.6.1

    Update README.md, releases/index.md and the store descriptions to include the new keyboard shortcuts.

commit 1852914
Author: John Dunning <fw@johndunning.com>
Date:   Thu Apr 29 12:39:39 2021 -0700

    Add IsLinux constant

    Use ctrl-alt-W on Linux/ChromeOS for closing a tab in the menu, since ctrl-W is intercepted by the browser.

commit 12809d5
Author: John Dunning <fw@johndunning.com>
Date:   Tue Mar 30 12:09:29 2021 -0700

    Update dependencies to the latest

commit ce05780
Author: John Dunning <fw@johndunning.com>
Date:   Mon Mar 29 11:29:26 2021 -0700

    Add ctrl-P/N and ctrl-K/J shortcuts for moving up/down

    Fix error in error-handler.js.  :|
    Let newer key bindings override older ones with the same shortcuts.

commit 03a044f
Author: John Dunning <fw@johndunning.com>
Date:   Sun Mar 28 17:27:40 2021 -0700

    Switch to using terser instead of babel

    Babel has this bug which appeared after trying to update to the latest version, and remained even after rolling back to an older version.  Extremely annoying.  babel/minify#974
    Add grunt-terser.
    Remove babel, core-js, lodash, which was used just once in build-popup.js, and react-virtualized, which wasn't used at all.
    Remove package-lock.json from .gitignore and commit it, to make it easier to track exact package changes.

commit e6efa20
Author: John Dunning <fw@johndunning.com>
Date:   Sat Mar 27 18:06:55 2021 -0700

    Fix build-popup.js

    Change npm build to run grunt build.

.gitignore

@@ -2,5 +2,4 @@
 /build/rjs
 /build/out
 /node_modules
-/package-lock.json
 /release

Gruntfile.js

@@ -199,14 +199,7 @@ module.exports = function(grunt) {
 			}
 		},
 
-		babel: {
-			options: {
-				shouldPrintComment: (val) => /@license|@preserve|\/\*!/.test(val),
-				comments: false,
-				minified: true,
-				compact: true,
-				sourceMaps: false
-			},
+		terser: {
 			rjs: {
 				files: {
 					"build/out/js/common/error-handler.js": "src/js/lib/error-handler.js",
@@ -362,7 +355,7 @@ module.exports = function(grunt) {
 			`cleanupManifest:${target}:${env}`,
 			"buildPopup",
 			"requirejs",
-			"babel",
+			"terser",
 			"sync:build",
 			"clean:rjs"
 		]);

README.md

@@ -80,8 +80,8 @@ Unlike other tab switchers, *QuicKey* uses a [Quicksilver](https://qsapp.com/)-s
 Use keyboard shortcuts to navigate the list of matching tabs:
 
   * <kbd>enter</kbd>&nbsp;: switch to the selected tab
-  * <kbd>↓</kbd> or <kbd>space</kbd>&nbsp;: move down the list
-  * <kbd>↑</kbd> or <b><kbd>shift</kbd><kbd>space</kbd></b>&nbsp;: move up the list
+  * <kbd>↓</kbd>, <kbd>space</kbd>, <b><kbd>ctrl</kbd><kbd>N</kbd></b> or <b><kbd>ctrl</kbd><kbd>J</kbd></b>&nbsp;: move down the list
+  * <kbd>↑</kbd>, <b><kbd>shift</kbd><kbd>space</kbd></b>, <b><kbd>ctrl</kbd><kbd>P</kbd></b> or <b><kbd>ctrl</kbd><kbd>K</kbd></b>&nbsp;: move up the list
   * <kbd>pg dn</kbd>&nbsp;: page down the list
   * <kbd>pg up</kbd>&nbsp;: page up the list
   * <kbd>end</kbd>&nbsp;: go to the bottom of the list
@@ -108,7 +108,7 @@ If new settings have been added to *QuicKey* since the last time you looked at t
 
 ## Close and reopen tabs
 
-To close the selected tab, press <b><kbd>ctrl</kbd><kbd>W</kbd></b> (<b><kbd>cmd</kbd><kbd>ctrl</kbd><kbd>W</kbd></b> on macOS).  Or hover over a tab and click the close button on the right side of the menu:
+To close the selected tab, press <b><kbd>ctrl</kbd><kbd>W</kbd></b> (<b><kbd>cmd</kbd><kbd>ctrl</kbd><kbd>W</kbd></b> on macOS, <b><kbd>ctrl</kbd><kbd>alt</kbd><kbd>W</kbd></b> on Linux).  Or hover over a tab and click the close button on the right side of the menu:
 
 <img src="docs/img/close-button.png" width="624" alt="Close button">
 

build/scripts/build-popup.js

@@ -2,7 +2,6 @@ const ReactDOMServer = require("react-dom/server");
 const React = require("react");
 const requirejs = require("requirejs");
 const fs = require("fs");
-const _ = require("lodash");
 
 
 const ConfigPattern = /({[\s\S]+})/m;
@@ -13,7 +12,6 @@ const configFile = fs.readFileSync("./src/js/require-config.js", "utf8");
 const currentPopupHTML = fs.readFileSync("./src/popup.html", "utf8");
 const currentReactMarkup = currentPopupHTML.match(RootPattern)[1];
 const match = configFile.match(ConfigPattern);
-let config;
 
 
 if (!match) {
@@ -22,17 +20,20 @@ if (!match) {
 	return "error";
 }
 
-	// create a fake navigator global, which init and shortcut-manager can check
+	// create a fake navigator global, which init, shortcut-manager and constants
+	// can check
 navigator = {
-	platform: "windows"
+	platform: "windows",
+	languages: ["en-US"],
+	userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.135 Safari/537.36"
 };
 
 	// we have to wrap the bare object in parens to eval it
-config = eval("(" + match[1] + ")");
+const config = eval("(" + match[1] + ")");
 
 	// switch some of the libraries to mocked versions so that we can require
 	// the App component outside of a browser
-config.paths = _.assign(config.paths, {
+config.paths = Object.assign(config.paths, {
 	cp: "../../build/mock/cp",
 		// the mock tracker needs to create a window global and then require
 		// the original tracker module

docs/chrome-store-description.txt

@@ -178,8 +178,8 @@ Unlike other tab switchers, QuicKey uses a Quicksilver-style search algorithm to
 Use keyboard shortcuts to navigate the list:
 
  • ENTER: switch to the selected tab
- • ↓ or SPACE: move down the list
- • ↑ or SHIFT-SPACE: move up the list
+ • ↓, SPACE or CTRL-N/J: move down the list
+ • ↑, SHIFT-SPACE or CTRL-P/K: move up the list
  • PG DN: page down the list
  • PG UP: page up the list
  • END: go to the bottom of the list
@@ -202,7 +202,7 @@ If new settings have been added to QuicKey since the last time you looked at the
 
 ★ Close and reopen tabs
 
-To close the selected tab, press CTRL-W (CMD-CTRL-W on macOS). Or hover over a tab and click the X button on the right side of the menu.
+To close the selected tab, press CTRL-W (CMD-CTRL-W on macOS, CTRL-ALT-W on Linux). Or hover over a tab and click the X button on the right side of the menu.
 
 When you open QuicKey, the 25 most recently closed tabs are listed below the recent tabs and shown in a faded state with a clock icon. They are also returned when you type a query, though their rank in the list of results is lower than open tabs. Click a closed tab to reopen it in its original location and with all of its browsing history intact.
 

docs/edge-store-description.txt

@@ -95,9 +95,11 @@ Add keyboard shortcuts to switch tabs with a Quicksilver-style search or a most
  • Press ENTER to switch to the selected tab
 
 
-★ Now with support for pinyin!
+★ New options in v1.6.0
 
-You can use pinyin to more easily search for Chinese characters in web page titles and URLs.
+ • Restore the last search query when the menu reopens
+ • Search for bookmarks by their folder names
+ • Control how the HOME and END keys behave
 
 
 ★ Use CTRL-TAB as the keyboard shortcut
@@ -157,8 +159,8 @@ Unlike other tab switchers, QuicKey uses a Quicksilver-style search algorithm to
 Use keyboard shortcuts to navigate the list:
 
  • ENTER: switch to the selected tab
- • ↓ or SPACE: move down the list
- • ↑ or SHIFT-SPACE: move up the list
+ • ↓, SPACE or CTRL-N/J: move down the list
+ • ↑, SHIFT-SPACE or CTRL-P/K: move up the list
  • PG DN: page down the list
  • PG UP: page up the list
  • END: go to the bottom of the list

docs/index.md

@@ -102,8 +102,8 @@ Unlike other tab switchers, *QuicKey* uses a [Quicksilver](https://qsapp.com/)-s
 Use keyboard shortcuts to navigate the list of matching tabs:
 
   * <kbd>enter</kbd>&nbsp;: switch to the selected tab
-  * <kbd>↓</kbd> or <kbd>space</kbd>&nbsp;: move down the list
-  * <kbd>↑</kbd> or <b><kbd>shift</kbd><kbd>space</kbd></b>&nbsp;: move up the list
+  * <kbd>↓</kbd>, <kbd>space</kbd>, <b><kbd>ctrl</kbd><kbd>N</kbd></b> or <b><kbd>ctrl</kbd><kbd>J</kbd></b>&nbsp;: move down the list
+  * <kbd>↑</kbd>, <b><kbd>shift</kbd><kbd>space</kbd></b>, <b><kbd>ctrl</kbd><kbd>P</kbd></b> or <b><kbd>ctrl</kbd><kbd>K</kbd></b>&nbsp;: move up the list
   * <kbd>pg dn</kbd>&nbsp;: page down the list
   * <kbd>pg up</kbd>&nbsp;: page up the list
   * <kbd>end</kbd>&nbsp;: go to the bottom of the list
@@ -130,7 +130,7 @@ If new settings have been added to *QuicKey* since the last time you looked at t
 
 ## Close and reopen tabs
 
-To close the selected tab, press <b><kbd>ctrl</kbd><kbd>W</kbd></b> (<b><kbd>cmd</kbd><kbd>ctrl</kbd><kbd>W</kbd></b> on macOS).  Or hover over a tab and click the close button on the right side of the menu:
+To close the selected tab, press <b><kbd>ctrl</kbd><kbd>W</kbd></b> (<b><kbd>cmd</kbd><kbd>ctrl</kbd><kbd>W</kbd></b> on macOS, <b><kbd>ctrl</kbd><kbd>alt</kbd><kbd>W</kbd></b> on Linux).  Or hover over a tab and click the close button on the right side of the menu:
 
 ![Close button](img/close-button.png)
 

docs/releases/index.md

@@ -8,6 +8,17 @@ comments: true
 # Release history
 
 
+## 1.6.1 - 2021-05-04
+
+### Added
+
+* <b><kbd>ctrl</kbd><kbd>N</kbd></b>/<b><kbd>ctrl</kbd><kbd>P</kbd></b> and <b><kbd>ctrl</kbd><kbd>J</kbd></b>/<b><kbd>ctrl</kbd><kbd>K</kbd></b> keyboard shortcuts for moving down/up the search results list.
+
+### Fixed
+
+* The default shortcut for closing a tab on Linux and ChromeOS is now <b><kbd>ctrl</kbd><kbd>alt</kbd><kbd>W</kbd></b>, since the browser doesn't let *QuicKey* intercept <b><kbd>ctrl</kbd><kbd>W</kbd></b> on those OSes.
+
+
 ## 1.6.0 - 2021-03-05
 
 ### Added