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

Merge branch 'master' of https://github.com/selz/plyr

Browse Source 
Conflicts:
	dist/plyr.js
	src/js/plyr.js
This commit is contained in:
Sam Potts 2015-03-10 23:57:36 +11:00
commit b677c3d7ad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/js/plyr.js
View File

@ -1,7 +1,7 @@
// ========================================================================== // ==========================================================================
// Plyr // Plyr
// plyr.js v1.0.25 // plyr.js v1.0.25
// https://github.com/sampotts/plyr // https://github.com/selz/plyr
// License: The MIT License (MIT) // License: The MIT License (MIT)
// ========================================================================== // ==========================================================================
// Credits: http://paypal.github.io/accessible-html5-video-player/ // Credits: http://paypal.github.io/accessible-html5-video-player/
@ -650,7 +650,7 @@
player.media.removeAttribute("controls"); player.media.removeAttribute("controls");
// Set media type // Set media type
player.type = (player.media.tagName == "VIDEO" ? "video" : "audio"); player.type = player.media.tagName.toLowerCase();
// Add type class // Add type class
_toggleClass(player.container, config.classes[player.type], true); _toggleClass(player.container, config.classes[player.type], true);
@ -1366,7 +1366,7 @@
// Disabled for <video> for iPhone // Disabled for <video> for iPhone
// Since it doesn't allow customisation // Since it doesn't allow customisation
if (element.querySelectorAll("audio, video")[0].tagName === "VIDEO" if (element.querySelectorAll("audio, video")[0].tagName.toLowerCase() === "video"
&& /iPhone/i.test(navigator.userAgent)) { && /iPhone/i.test(navigator.userAgent)) {
continue; continue;
} }