Fix Youtube connector issues. Closes #757

connectors/v2/youtube.js

@@ -18,9 +18,31 @@ Connector.playerSelector = '#page';
 
 Connector.artistTrackSelector = '#eow-title';
 
-Connector.currentTimeSelector = '#player-api .ytp-time-current';
+/**
+ * Because player can be still present in the page, we need to detect that it's invisible
+ * and don't return current time. Otherwise resulting state may not be considered empty.
+ */
+Connector.getCurrentTime = function() {
+	if (isPlayerOffscreen()) {
+		return null;
+	}
 
-Connector.durationSelector = '#player-api .ytp-time-duration';
+	var $time = $('#player-api .ytp-time-current');
+	return this.stringToSeconds($time.text());
+};
+
+/**
+ * Because player can be still present in the page, we need to detect that it's invisible
+ * and don't return duration. Otherwise resulting state may not be considered empty.
+ */
+Connector.getDuration = function() {
+	if (isPlayerOffscreen()) {
+		return 0;
+	}
+
+	var $duration = $('#player-api .ytp-time-duration');
+	return this.stringToSeconds($duration.text());
+};
 
 Connector.getUniqueID = function() {
 	var url = window.location.href;
@@ -85,3 +107,17 @@ Connector.getArtistTrack = function () {
 
 	return {artist: artist, track: track};
 };
+
+/**
+ * YouTube doesn't really unload the player. It simply moves it outside viewport.
+ * That has to be checked, because our selectors are still able to detect it.
+ */
+function isPlayerOffscreen() {
+	var $player = $('#player-api');
+	if ($player.length === 0) {
+		return false;
+	}
+
+	var offset = $player.offset();
+	return offset.left < 0 || offset.top < 0;
+}

core/connectors.js

@@ -37,7 +37,7 @@ define(function() {
 
 		{
 			label: 'YouTube',
-			matches: ['*://www.youtube.com/watch*', '*://www.youtube.com/user/*'],
+			matches: ['*://www.youtube.com/*'],
 			js: ['connectors/v2/youtube.js'],
 			version: 2
 		},