ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cancel requests on source change (Fixes #174)

Browse Source
This commit is contained in:
Sam Potts
2016-02-28 12:50:34 +11:00
parent 1bbc47c64f
commit cd83a2670b
5 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/js/plyr.js
View File

@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
// plyr.js v1.5.15
// plyr.js v1.5.16
// https://github.com/selz/plyr
// License: The MIT License (MIT)
// ==========================================================================
@ -2225,6 +2225,9 @@
_remove(plyr.videoContainer);
}
// Cancel current network requests
_cancelRequests();
// Remove the old media
_remove(plyr.media);
@ -2521,6 +2524,31 @@
});
}
// Cancel current network requests
// See https://github.com/Selz/plyr/issues/174
function _cancelRequests() {
if(!_inArray(config.types.html5, plyr.type)) {
return;
}
// Set empty src attribute
plyr.media.setAttribute('src', '');
// Remove child sources
var sources = plyr.media.querySelectorAll('source');
for (var i = 0; i < sources.length; i++) {
_remove(sources[i]);
}
// Load the new empty source
// This will cancel existing requests
// See https://github.com/Selz/plyr/issues/174
plyr.media.load();
// Debugging
_log("Cancelled network requests for old media");
}
// Destroy an instance
// Event listeners are removed when elements are removed
// http://stackoverflow.com/questions/12528049/if-a-dom-element-is-removed-are-its-listeners-also-removed-from-memory
@ -2547,7 +2575,7 @@
// If video, we need to remove some more
if (plyr.type === 'video') {
// Remove captions
// Remove captions container
_remove(_getElement(config.selectors.captions));
// Remove video wrapper