show id in history; esc closes history

app/addressbar/index.js

@@ -88,6 +88,10 @@ function onBlur () {
 	el[0].value = getUnfocusedText();
 }
 
+function onKeyPress (e) {
+	if (e.key === 'Enter') return gotoUrl();
+}
+
 function onKeyDown (e) {
 	if (e.key === 'ArrowDown') return $.trigger('focus-address-results');
 	if (e.key === 'Escape') {
@@ -97,10 +101,6 @@ function onKeyDown (e) {
 	}
 }
 
-function onKeyPress (e) {
-	if (e.key === 'Enter') return gotoUrl();
-}
-
 function onInput (e) {
 	$.trigger('address-input', e);
 }

app/frame/index.js

@@ -117,6 +117,7 @@ function init () {
 	webview = frame.find('#webview');
 
 
+	webview.on('focus', () => $.trigger('frame-focused'));
 	webview.on('will-navigate', gotoUrl);
 	webview.on('did-navigate-in-page', onNavigationStart);
 	webview.on('dom-ready', onNavigationEnd);

app/history/index.js

@@ -8,7 +8,7 @@ let el, listEl, isVisible = false, isReady = false;
 function hide () {
 	if (!isVisible) return;
 	isVisible = false;
-	el.show().animate({ opacity: 1 }, { opacity: 0 }).then(el.hide);
+	el.show().animate({ opacity: 1 }, { opacity: 0 }).then(el.hide.bind(el));
 }
 
 
@@ -28,9 +28,10 @@ function onUrlChanged (webview, issue) {
 
 
 function getItemHtml (item, i) {
+	const mod = item.repo.split('/').pop() + '#' + item.id;
 	let selected = '';
 	if (i === 0) selected = 'selected="selected"';
-	return `<option ${selected} value="${item._id}">${item.name}</option>`;
+	return `<option ${selected} value="${item._id}">${item.name} (${mod})</option>`;
 }
 
 
@@ -58,6 +59,10 @@ function onKeyDown (e) {
 	if (e.key === 'ArrowUp' && listEl[0].selectedIndex === 0) {
 		$.trigger('focus-addressbar');
 	}
+	else if (e.key === 'Escape') {
+		hide();
+		$.trigger('focus-addressbar');
+	}
 }
 
 
@@ -89,6 +94,7 @@ function init () {
 	$.on('address-input-end', hide);
 	$.on('focus-address-results', focusResults);
 	$.on('document-clicked', onDocumentClick);
+	$.on('frame-focused', hide);
 
 	isReady = true;
 }