web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-07-03 00:57:02 +02:00
Code Releases Activity

Fixed type support checking for an empty src string. closes #1797

Browse Source
This commit is contained in:
heff
2015-01-16 11:42:27 -08:00
parent a3b12d9d03
commit e8235c9022
3 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/js/media/html5.js
View File

@ -307,13 +307,13 @@ vjs.Html5.nativeSourceHandler = {};
* @return {String} 'probably', 'maybe', or '' (empty string)
*/
vjs.Html5.nativeSourceHandler.canHandleSource = function(source){
var ext;
var match, ext;
function canPlayType(type){
// IE9 on Windows 7 without MediaPlayer throws an error here
// https://github.com/videojs/video.js/issues/519
try {
return !!vjs.TEST_VID.canPlayType(type);
return vjs.TEST_VID.canPlayType(type);
} catch(e) {
return '';
}
@ -322,11 +322,15 @@ vjs.Html5.nativeSourceHandler.canHandleSource = function(source){
// If a type was provided we should rely on that
if (source.type) {
return canPlayType(source.type);
} else {
} else if (source.src) {
// If no type, fall back to checking 'video/[EXTENSION]'
ext = source.src.match(/\.([^\/\?]+)(\?[^\/]+)?$/i)[1];
match = source.src.match(/\.([^\/\?]+)(\?[^\/]+)?$/i);
ext = match && match[1];
return canPlayType('video/'+ext);
}
return '';
};
/**