controls: fix hotkeys when focusing elements

[chrome-ext/music-player-client.git] / main.js

diff --git a/main.js b/main.js
index a5bf7841f730014dac609bb68e3145552b829e82..16875983968fd05b34c142910747a369b2bb5517 100644 (file)
--- a/main.js
+++ b/main.js
@@ -61,17 +61,23 @@ window.onload = function() {
 };
 
 window.onkeypress = function(e) {
+       if (e.target != document.body) {
+               /* Only allow the shortcuts when the focus is on the body.
+                  Otherwise you can't type these numbers into text fields. */
+               return;
+       }
+
        switch (e.keyCode) {
        case 49: // 1
                show_page('controls');
                break;
-       case 50: // 1
+       case 50: // 2
                show_page('metadata');
                break;
-       case 51: // 1
+       case 51: // 3
                show_page('playlist');
                break;
-       case 52: // 1
+       case 52: // 4
                show_page('options');
                break;
        }
@@ -157,12 +163,15 @@ function show_page(page) {
        if (typeof(page) != 'string')
                page = this.id.split('.')[1];
 
+       // We might not be connected in which case 'mpc' will be undefined.
        switch (page) {
        case 'playlist':
-               mpc.playlistinfo();
+               if (mpc)
+                       mpc.playlistinfo();
                // Fallthrough.
        case 'metadata':
-               mpc.currentsong();
+               if (mpc)
+                       mpc.currentsong();
                break;
        }
 
@@ -310,13 +319,16 @@ function update_ui(state, cmd) {
        }
 
        /* Update the metadata tab only when things have changed. */
-       if ('Currentsong' in state && ui_mpc_metadata_file.lastUpdate != state.Currentsong.lastUpdate) {
-               var currentsong = state.Currentsong;
-               ui_mpc_metadata_album.innerText = currentsong.Album;
-               ui_mpc_metadata_artist.innerText = currentsong.Artist;
-               ui_mpc_metadata_title.innerText = currentsong.Title;
-               ui_mpc_metadata_date.innerText = currentsong.Date;
-               ui_mpc_metadata_file.innerText = currentsong.file;
+       var currentsong;
+       if ('Currentsong' in state) {
+               currentsong = state.Currentsong;
+               if (ui_mpc_metadata_file.lastUpdate != state.Currentsong.lastUpdate) {
+                       ui_mpc_metadata_album.innerText = currentsong.Album;
+                       ui_mpc_metadata_artist.innerText = currentsong.Artist;
+                       ui_mpc_metadata_title.innerText = currentsong.Title;
+                       ui_mpc_metadata_date.innerText = currentsong.Date;
+                       ui_mpc_metadata_file.innerText = currentsong.file;
+               }
        }
 
        /* Update the playlist tab only when things have changed. */
@@ -326,7 +338,7 @@ function update_ui(state, cmd) {
                ui_mpc_playlist.innerHTML = '';
                playlist.forEach(function(song) {
                        var cell, row = ui_mpc_playlist.insertRow(-1);
-                       if (song.Pos == currentsong.Pos)
+                       if (currentsong && song.Pos == currentsong.Pos)
                                row.style.fontWeight = 'bold';
 
                        cell = row.insertCell(-1);