« get me outta code hell

Merge branch 'master' into web-mtui - mtui - Music Text User Interface - user-friendly command line music player
about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorrie <towerofnix@gmail.com>2018-12-23 00:53:28 -0400
committerFlorrie <towerofnix@gmail.com>2018-12-23 00:53:28 -0400
commitecb1890db2c0f85cc033753e31ab8804de55133c (patch)
tree3846253ec980283cf352a6f4d0f3f3c8362ee845
parent9162068126fffe4fa0d13d174cc3c14373fa2588 (diff)
parentb0f256ea0352fd86f40c6e4bd18bee47c36c320b (diff)
Merge branch 'master' into web-mtui
-rw-r--r--README.md2
-rw-r--r--ui.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 5071468..c59f80b 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ You're also welcome to share any ideas, suggestions, and questions through there
 * <kbd>Escape</kbd> - stop playing the current track
 * <kbd>Right</kbd> - seek ahead
 * <kbd>Left</kbd> - seek back
-* <kbd><kbd>Ctrl</kbd>+<kbd>O</kbd></kbd> - jump to a track or group by entering (part of) its name
+* <kbd><kbd>Ctrl</kbd>+<kbd>F</kbd></kbd> or <kbd>/</kbd> - jump to a track or group by entering (part of) its name
 * <kbd><kbd>Ctrl</kbd>+<kbd>O</kbd></kbd> - open a playlist from a source (like a /path/to/a/folder or a YouTube playlist URL) (you can also just pass this source to `mtui`)
 * <kbd>t</kbd> and <kbd>T</kbd> (shift+T) - switch between playlist tabs
 * <kbd><kbd>Ctrl</kbd>+<kbd>T</kbd></kbd> - open the current playlist in a new tab (so, clone the current tab)
diff --git a/ui.js b/ui.js
index fc38401..69fc7f1 100644
--- a/ui.js
+++ b/ui.js
@@ -250,7 +250,7 @@ class AppElement extends FocusElement {
       items: [
         // A label that just shows some brief information about the item.
         isGroup && {label:
-          `("${item.name}" -` +
+          `(${item.name ? `"${item.name}"` : 'Unnamed'} -` +
           ` ${item.items.length} item${item.items.length === 1 ? '' : 's'}` +
           `, ${countTotalItems(item)} total` +
           ')'},
@@ -965,7 +965,7 @@ class GrouplikeListingElement extends Form {
       // within any groups (so you can't bworse a parent and access its menu
       // from there).
       if (!this.grouplike.isTheQueue) {
-        const ownElement = new BasicGrouplikeItemElement(`This group: ${this.grouplike.name}`)
+        const ownElement = new BasicGrouplikeItemElement(`This group: ${this.grouplike.name || '(Unnamed group)'}`)
         ownElement.item = this.grouplike
         ownElement.recordStore = this.recordStore
         ownElement.isGroup = true