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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
#	docs/dist/docs.css
#	docs/dist/docs.js
#	docs/index.html
#	docs/src/js/docs.js
#	docs/src/less/components/icons.less
#	docs/src/less/components/type.less
#	docs/src/less/docs.less
#	gulpfile.js
#	package.json
#	src/js/plyr.js
This commit is contained in:
Sam
2015-12-13 22:49:02 +11:00
parent cd2532867c 1371c1341f
commit ee2cdb2c9b
15 changed files with 223 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
docs/index.html
View File

@ -8,10 +8,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Styles -->
<link rel="stylesheet" href="https://cdn.plyr.io/1.3.5/plyr.css">
<link rel="stylesheet" href="https://cdn.plyr.io/1.3.7/plyr.css">
<!-- Docs styles -->
<link rel="stylesheet" href="https://cdn.plyr.io/1.3.5/docs.css">
<link rel="stylesheet" href="https://cdn.plyr.io/1.3.7/docs.css">
</head>
<body>
<header>
@ -21,12 +21,12 @@
<ul>
<li>
<a href="https://github.com/selz/plyr" target="_blank" class="btn btn-primary" data-shr-network="github">
<svg class="icon"><use xlink:href="#icon-github"/></svg>Download on GitHub
<svg class="icon"><use xlink:href="#shr-github"/></svg>Download on GitHub
</a>
</li>
<li>
<a href="https://twitter.com/intent/tweet?text=A+simple+HTML5+media+player+with+custom+controls+and+WebVTT+captions.&url=http%3A%2F%2Fplyr.io&via=Sam_Potts" target="_blank" class="btn btn-twitter" data-shr-network="twitter">
<svg class="icon"><use xlink:href="#icon-twitter"/></svg>Tweet
<svg class="icon"><use xlink:href="#shr-twitter"/></svg>Tweet
</a>
</li>
</ul>
@ -56,9 +56,11 @@
<!-- Video files -->
<source src="https://cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
<source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
<!-- Text track file -->
<track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/example_captions_en.vtt" default>
<!-- Fallback for browsers that don't support the <video> element -->
<a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
@ -77,22 +79,39 @@
<!-- Load SVG defs -->
<!-- You should bundle all SVG/Icons into one file using a build tool such as gulp and svg store -->
<script>
function loadSprite(d, u) {
var a = new XMLHttpRequest(),
b = document.body;
(function() {
[
"https://cdn.shr.one/0.1.9/sprite.svg",
"https://cdn.plyr.io/1.3.7/sprite.svg"
]
.forEach(function(u) {
var x = new XMLHttpRequest(),
b = document.body;
// If proper CORS supported
if("withCredentials" in a) {
a.open("GET", u, true);
a.send();
a.onload = function(){
// Check for CORS support
// If you're loading from same domain, you can remove the if statement
// XHR for Chrome/Firefox/Opera/Safari
if ("withCredentials" in x) {
x.open("GET", u, true);
}
// XDomainRequest for older IE
else if (typeof XDomainRequest != "undefined") {
x = new XDomainRequest();
x.open("GET", u);
}
else {
return;
}
x.send();
x.onload = function() {
var c = document.createElement("div");
c.setAttribute("hidden", "");
c.innerHTML = a.responseText;
c.innerHTML = x.responseText;
b.insertBefore(c, b.childNodes[0]);
}
}
}
});
})();
// Load the plyr sprite
loadSprite(document, "../dist/sprite.svg");
@ -101,12 +120,12 @@
</script>
<!-- Plyr core script -->
<script src="https://cdn.plyr.io/1.3.5/plyr.js"></script>
<script src="https://cdn.plyr.io/1.3.7/plyr.js"></script>
<!-- Shr core script -->
<script src="https://cdn.shr.one/0.1.7/shr.js"></script>
<script src="https://cdn.shr.one/0.1.9/shr.js"></script>
<!-- Docs script -->
<script src="https://cdn.plyr.io/1.3.5/docs.js"></script>
<script src="https://cdn.plyr.io/1.3.7/docs.js"></script>
</body>
</html>