Merge branch 'develop' into a11y-improvements

# Conflicts:
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map

1 files changed, 23 insertions, 23 deletions

diff --git a/dist/plyr.js b/dist/plyr.js
index f2ed3969..775c971d 100644
--- a/dist/plyr.js
+++ b/dist/plyr.js
@@ -780,22 +780,17 @@ typeof navigator === "object" && (function (global, factory) {
 
             // Quality
             Object.defineProperty(player.media, 'quality', {
-                get: function get$$1() {
+                get: function get() {
                     // Get sources
                     var sources = html5.getSources.call(player);
-
-                    var _sources$filter = sources.filter(function (source) {
+                    var source = sources.find(function (source) {
                         return source.getAttribute('src') === player.source;
-                    }),
-                        _sources$filter2 = slicedToArray(_sources$filter, 1),
-                        source = _sources$filter2[0];
+                    });
 
                     // Return size, if match is found
-
-
                     return source && Number(source.getAttribute('size'));
                 },
-                set: function set$$1(input) {
+                set: function set(input) {
                     // Get sources
                     var sources = html5.getSources.call(player);
 
@@ -810,25 +805,30 @@ typeof navigator === "object" && (function (global, factory) {
                     }
 
                     // Get current state
-                    var currentTime = player.currentTime,
-                        playing = player.playing;
+                    var _player$media = player.media,
+                        currentTime = _player$media.currentTime,
+                        paused = _player$media.paused,
+                        preload = _player$media.preload,
+                        readyState = _player$media.readyState;
 
                     // Set new source
 
                     player.media.src = source.getAttribute('src');
 
-                    // Restore time
-                    var onLoadedMetaData = function onLoadedMetaData() {
-                        player.currentTime = currentTime;
-                    };
-                    player.once('loadedmetadata', onLoadedMetaData);
+                    // Prevent loading if preload="none" and the current source isn't loaded (#1044)
+                    if (preload !== 'none' || readyState) {
+                        // Restore time
+                        player.once('loadedmetadata', function () {
+                            player.currentTime = currentTime;
 
-                    // Load new source
-                    player.media.load();
+                            // Resume playing
+                            if (!paused) {
+                                player.play();
+                            }
+                        });
 
-                    // Resume playing
-                    if (playing) {
-                        player.play();
+                        // Load new source
+                        player.media.load();
                     }
 
                     // Trigger change event
@@ -5816,8 +5816,8 @@ typeof navigator === "object" && (function (global, factory) {
                                 return Number(instance.getCurrentTime());
                             },
                             set: function set(time) {
-                                // If paused, mute audio preventively (YouTube starts playing on seek if the video hasn't been played yet).
-                                if (player.paused) {
+                                // If paused and never played, mute audio preventively (YouTube starts playing on seek if the video hasn't been played yet).
+                                if (player.paused && !player.embed.hasPlayed) {
                                     player.embed.mute();
                                 }