Release v1.3.4

Squashed commit of the following: commit 16ba7e093bf59ca2dc2fe3ac6e36a3317b10dccb Author: John Dunning <[email protected]> Date: Tue Jan 21 19:38:02 2020 -0800 Update version to 1.3.4 Update releases/index.md. commit db4ebe86be87d3767d6ade0c7999f98d1aa912be Author: John Dunning <[email protected]> Date: Mon Jan 20 18:16:54 2020 -0800 Don't listen to tabs.onCreated during startup All the tabs were getting added as they were created in an inactive state, which pushed the recent tabs out of the list. Updated edge-store-description.txt to use InCognito and favorites language. commit 39d9a9d28d42f3a2438391f4b9c984daf21e666f Author: John Dunning <[email protected]> Date: Sat Jan 18 18:07:32 2020 -0800 Fix resetting of hitMask in quick-score.js Always resetting the length to 0 when the remainingScore was 0 was not correct. Instead, we need to reset the length to what it was when the current quickScore() call began. commit f1455200ffd1468cfe618924cccbda3976c437fa Author: John Dunning <[email protected]> Date: Sat Jan 18 12:51:49 2020 -0800 Tweak store docs commit 3d40a1b944a9da1f8c6b03e3604bc9ffa4be1fd5 Author: John Dunning <[email protected]> Date: Wed Jan 15 19:28:10 2020 -0800 Tweak Edge store text
fwextensions · Jan 22, 2020 · bbc8e8e · bbc8e8e
1 parent d42d91d
commit bbc8e8e
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 32 deletions.
diff --git a/docs/chrome-store-description.txt b/docs/chrome-store-description.txt
@@ -252,7 +252,8 @@ When first installed, QuicKey asks for these permissions:
  ➤ "Read and change your bookmarks"
 
       QuicKey uses this permission to let you search the titles and URLs of
-      your bookmarked pages. It will never change your bookmarks.
+      your bookmarked pages. The only time it changes your bookmarks is when
+      you choose to delete one.
 
 QuicKey can't access or manipulate the content of any pages you visit and doesn't transmit any information other than some anonymized diagnostic data.
 
@@ -261,10 +262,10 @@ If you right-click the QuicKey icon on the toolbar, there's a message saying "Ca
 
 ★ Support and source code
 
-For more information, go to https://fwextensions.github.io/QuicKey/
+Get more information at https://fwextensions.github.io/QuicKey/
 
-To report a bug or request a feature, go to https://fwextensions.github.io/QuicKey/support/
+Report a bug or request a feature at https://fwextensions.github.io/QuicKey/support/
 
 View the release history at https://fwextensions.github.io/QuicKey/releases
 
-The QuicKey source code is at https://github.com/fwextensions/QuicKey
+See the source code at https://github.com/fwextensions/QuicKey
diff --git a/docs/edge-store-description.txt b/docs/edge-store-description.txt
@@ -78,6 +78,9 @@ tab search
 ctrl-tab navigation
 
 
+Any open tab can be immediately searched after installation.  The list of recent tabs will be empty immediately after the extension is installed, but tabs will be added to the list as you switch between them.
+
+
 ★
 ➤
 ↑ ↓
@@ -183,7 +186,7 @@ You can move tabs to the left or right of the current tab, making it easy to pul
  • Press CTRL-[ to move the selected tab to the left of the current one.
  • Press CTRL-] to move it to the right.
 
-Include SHIFT in the shortcut to also unsuspend the tab while moving it. The CTRL key should be used on both Windows and macOS. Note that you cannot move tabs between normal and incognito windows.
+Include SHIFT in the shortcut to also unsuspend the tab while moving it. The CTRL key should be used on both Windows and macOS. Note that you cannot move tabs between normal and InPrivate windows.
 
 
 ★ Distinguish tabs with identical titles
@@ -222,11 +225,11 @@ If you use the handy extension "The Great Suspender", then suspended tabs will l
 Press SHIFT-ENTER to switch to a tab and unsuspend it in one go. Or shift-click it with the mouse.
 
 
-★ Incognito mode
+★ InPrivate mode
 
-To switch to incognito tabs as well as normal ones, right-click the QuicKey icon and select Options from the menu. Scroll to the very bottom of the QuicKey options page and then click the "Change incognito settings" button. On the extensions page that opens, scroll down to the "Allow in incognito" option and click the toggle button next to it.
+To switch to InPrivate tabs as well as normal ones, right-click the QuicKey icon and select "Extension options" from the menu. Scroll to the very bottom of the QuicKey options page and then click the "Change InPrivate settings" button. On the extensions page that opens, scroll down to the "Allow in InPrivate" option and click the toggle button next to it.
 
-Tabs in incognito mode display the incognito icon under the page's favicon, so you can distinguish a normal tab from an incognito one with the same title.
+Tabs in InPrivate mode display the InPrivate icon under the page's favicon, so you can distinguish a normal tab from an InPrivate one with the same title.
 
 
 ★ Copy a URL or title
@@ -242,17 +245,18 @@ You can also copy the URL and title of the selected tab, bookmark or history ite
 
 When first installed, QuicKey asks for these permissions:
 
- ➤ "Read and change your browsing history on all signed-in devices"
+ ➤ "Read and modify your browsing history on all your signed-in devices"
 
       QuicKey uses this permission to let you search the titles and URLs of
-      the open tabs, as well as pages from your history. The "all signed-in
+      the open tabs, as well as pages from your history. The "all your signed-in
       devices" part is there only so that recently closed tabs can be restored
       with their full history.
 
- ➤ "Read and change your bookmarks"
+ ➤ "Read and change your favorites"
 
       QuicKey uses this permission to let you search the titles and URLs of
-      your bookmarked pages. It will never change your bookmarks.
+      pages in your favorites. The only time it changes your favorites is when
+      you choose to delete one.
 
 QuicKey can't access or manipulate the content of any pages you visit and doesn't transmit any information other than some anonymized diagnostic data.
 
@@ -261,10 +265,10 @@ If you right-click the QuicKey icon on the toolbar, there's a message saying "Ca
 
 ★ Support and source code
 
-For more information, go to https://fwextensions.github.io/QuicKey/
+Get more information at https://fwextensions.github.io/QuicKey/
 
-To report a bug or request a feature, go to https://fwextensions.github.io/QuicKey/support/
+Report a bug or request a feature at https://fwextensions.github.io/QuicKey/support/
 
 View the release history at https://fwextensions.github.io/QuicKey/releases
 
-The QuicKey source code is at https://github.com/fwextensions/QuicKey
+See the source code at https://github.com/fwextensions/QuicKey
diff --git a/docs/releases/index.md b/docs/releases/index.md
@@ -8,6 +8,22 @@ comments: true
 # Release history
 
 
+## 1.3.4 - 2020-01-21
+
+### Fixed
+
+* The matching letters in search results would not be shown correctly in some cases.
+
+* The order of recent tabs was sometimes lost when restarting the browser.  
+
+
+## 1.3.3 - 2020-01-15
+
+### Added 
+
+* Support for the new Edge browser.  This version only launched in the Edge store.
+
+
 ## 1.3.2 - 2020-01-08
 
 ### Fixed

diff --git a/src/js/background/background.js b/src/js/background/background.js
@@ -270,7 +270,7 @@ require([
 
 
 	chrome.tabs.onCreated.addListener(tab => {
-		if (!tab.active) {
+		if (!gStartingUp && !tab.active) {
 				// this tab was opened by ctrl-clicking a link or by opening
 				// all the tabs in a bookmark folder, so pass true to insert
 				// this tab in the penultimate position, which makes it the
@@ -430,6 +430,7 @@ DEBUG && console.log(e);
 
 			backgroundTracker.pageview();
 			backgroundTracker.timing("loading", "background", performance.now());
+DEBUG && console.log("=== startup done", performance.now());
 		})
 			// pause the chain to wait for the installed promise to resolve,
 			// which it will never do if the event doesn't fire.  if it does,

diff --git a/src/js/popup/app.js b/src/js/popup/app.js
@@ -44,9 +44,7 @@ define("popup/app", [
 	const MinScoreDiff = .1;
 	const BookmarksQuery = "/b ";
 	const HistoryQuery = "/h ";
-	const BQuery = "/b";
-	const HQuery = "/h";
-	const CommandQuery = "/";
+	const CommandQueryPattern = /^\/[bh]?$/;
 	const NoRecentTabsMessage = [{
 		message: "Recently used tabs will appear here as you continue browsing",
 		faviconURL: "img/alert.svg",
@@ -576,7 +574,7 @@ define("popup/app", [
 				if (!this.history.length) {
 					this.loadPromisedItems(getHistory, "history", HistoryQuery);
 				}
-			} else if (query == CommandQuery || query == BQuery || query == HQuery) {
+			} else if (CommandQueryPattern.test(query)) {
 					// we don't know if the user's going to type b or h, so
 					// don't match any items
 				this.mode = "command";

diff --git a/src/js/popup/score/quick-score.js b/src/js/popup/score/quick-score.js
@@ -32,8 +32,7 @@ define(function() {
 		abbreviationRange = abbreviationRange || new Range(0, abbreviation.length);
 		fullMatchedRange = fullMatchedRange || new Range();
 
-// TODO: why is the second test necessary?  !"" is true
-		if (!abbreviation || !abbreviationRange.length) {
+		if (!abbreviationRange.length) {
 				// deduct some points for all remaining characters
 			return IgnoredScore;
 		}
@@ -42,6 +41,8 @@ define(function() {
 			return 0;
 		}
 
+		const initialHitMaskLength = hitMask && hitMask.length;
+
 		for (var i = abbreviationRange.length; i > 0; i--) {
 			var abbreviationSubstring = abbreviation.substr(abbreviationRange.location, i),
 				matchedRange = rangeOfString(itemString, abbreviationSubstring, searchRange);
@@ -52,7 +53,8 @@ define(function() {
 				continue;
 			}
 
-// TODO: do we need this?  new code doesn't have it
+// TODO: do we need this?  new code doesn't have it.  that's because it's
+//  reducing the search range by the length of the remaining query before searching
 			if (matchedRange.location + abbreviationRange.length > searchRange.max()) {
 				continue;
 			}
@@ -163,17 +165,15 @@ define(function() {
 				/* DEBUG log(clip(score)); */
 
 				return score;
+			} else if (hitMask) {
+					// the remaining abbreviation does not appear in the remaining
+					// string, so strip off any matches we've added during the
+					// current call, as they'll be invalid when we start over
+					// with a shorter piece of the abbreviation
+				hitMask.length = initialHitMaskLength;
 			}
 		}
 
-		if (hitMask) {
-				// the remaining abbreviation does not appear in the remaining
-				// string, so clear the hitMask, since we'll start over with a
-				// shorter piece of the abbreviation, which might match earlier
-				// in the string, making the existing match indexes invalid.
-			hitMask.length = 0;
-		}
-
 		return 0;
 	}
 

diff --git a/src/manifest.json b/src/manifest.json
@@ -2,7 +2,7 @@
 	"manifest_version": 2,
 	"name": "QuicKey DEV",
 	"short_name": "QuicKey",
-	"version": "1.3.3",
+	"version": "1.3.4",
 	"description": "Add keyboard shortcuts to switch tabs with a Quicksilver-style search or a most recently used menu",
 	"author": "John Dunning",
 	"content_security_policy": "script-src 'self' 'unsafe-eval' https://www.google-analytics.com; object-src 'self'",