X-Git-Url: https://git.wh0rd.org/?p=chrome-ext%2Fmusic-player-client.git;a=blobdiff_plain;f=main.js;h=3ff3ca46906251888f02af57737083d149c446e0;hp=a5bf7841f730014dac609bb68e3145552b829e82;hb=HEAD;hpb=3a55dda47c0031b6706d1b1c45092c7766047da4

diff --git a/main.js b/main.js
index a5bf784..3ff3ca4 100644
--- 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;
 	}
@@ -97,7 +103,12 @@ function mpc_connect(host, port) {
 
 	update_ui('init');
 	tcpclient = new TcpClient(host, port);
-	tcpclient.connect(function() {
+	tcpclient.connect(function(resultCode) {
+		if (resultCode < 0) {
+			update_ui('error', resultCode);
+			return;
+		}
+
 		var mpc_sender = new TcpClientSender(tcpclient);
 		tcpclient.addResponseListener(tramp_mpc_recv);
 		mpc = new Mpc(mpc_sender, update_ui);
@@ -157,12 +168,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;
 	}
 
@@ -292,6 +306,7 @@ function update_ui(state, cmd) {
 		ui_mpc_status.innerText = ({
 			'disconnect': 'Disconnecting...',
 			'init': 'Connecting...',
+			'error': 'Connection error ' + cmd,
 		})[state];
 		return;
 	}
@@ -310,13 +325,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 +344,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);