Merge branch 'develop'

src/js/html5.js

@@ -39,7 +39,7 @@ const html5 = {
             get() {
                 // Get sources
                 const sources = html5.getSources.call(player);
-                const [source] = sources.filter(source => source.getAttribute('src') === player.source);
+                const source = sources.find(source => source.getAttribute('src') === player.source);
 
                 // Return size, if match is found
                 return source && Number(source.getAttribute('size'));
@@ -57,23 +57,25 @@ const html5 = {
                 }
 
                 // Get current state
-                const { currentTime, playing } = player;
+                const { currentTime, paused, preload, readyState } = player.media;
 
                 // Set new source
                 player.media.src = source.getAttribute('src');
 
+                // Prevent loading if preload="none" and the current source isn't loaded (#1044)
+                if (preload !== 'none' || readyState) {
                     // Restore time
-                const onLoadedMetaData = () => {
+                    player.once('loadedmetadata', () => {
                         player.currentTime = currentTime;
-                };
+
-                player.once('loadedmetadata', onLoadedMetaData);
+                        // Resume playing
+                        if (!paused) {
+                            player.play();
+                        }
+                    });
 
                     // Load new source
                     player.media.load();
-
-                // Resume playing
-                if (playing) {
-                    player.play();
                 }
 
                 // Trigger change event

src/js/plugins/youtube.js

@@ -270,8 +270,8 @@ const youtube = {
                             return Number(instance.getCurrentTime());
                         },
                         set(time) {
-                            // If paused, mute audio preventively (YouTube starts playing on seek if the video hasn't been played yet).
+                            // If paused and never played, mute audio preventively (YouTube starts playing on seek if the video hasn't been played yet).
-                            if (player.paused) {
+                            if (player.paused && !player.embed.hasPlayed) {
                                 player.embed.mute();
                             }