Merge branch 'master' into develop
# Conflicts: # dist/plyr.css # dist/plyr.js
This commit is contained in:
Sam Potts
commit
240aa7aa5f
2
dist/sprite.svg
vendored
2
dist/sprite.svg
vendored
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
2
docs/dist/docs.css
vendored
2
docs/dist/docs.css
vendored
@ -1 +1 @@
|
|||||||
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@font-face{font-family:Avenir;src:url(//cdn.plyr.io/fonts/avenir-medium.woff2) format("woff2"),url(//cdn.plyr.io/fonts/avenir-medium.woff) format("woff"),url(//cdn.plyr.io/fonts/avenir-medium.ttf) format("truetype");font-style:normal;font-weight:400}@font-face{font-family:Avenir;src:url(//cdn.plyr.io/fonts/avenir-bold.woff2) format("woff2"),url(//cdn.plyr.io/fonts/avenir-bold.woff) format("woff"),url(//cdn.plyr.io/fonts/avenir-bold.ttf) format("truetype");font-style:normal;font-weight:600}*,::after,::before{box-sizing:border-box}body{font-family:Avenir,"Helvetica Neue",Helvetica,Arial,sans-serif;background:#fff;line-height:1.5;text-align:center;color:#6D797F}.error body,html.error{height:100%}.error body{width:100%;display:table;table-layout:fixed}.error main{display:table-cell;width:100%;vertical-align:middle}h1,h2{letter-spacing:-.025em;color:#2E3C44;margin:0 0 10px;line-height:1.2;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}h1{font-size:64px;font-size:4rem;color:#3498DB}p,small{margin:0 0 20px}small{display:block;padding:0 10px;font-size:14px;font-size:.9rem}header{padding:20px;margin-bottom:20px}header p{font-size:18px;font-size:1.1rem}@media (min-width:560px){header{padding-top:60px;padding-bottom:60px}}section{padding-bottom:20px}@media (min-width:560px){section{padding-bottom:40px}}a{text-decoration:none;color:#3498db;border-bottom:1px solid currentColor;transition:all .3s ease}a:focus,a:hover{color:#000}a:focus{outline:#343f4a dotted thin;outline-offset:1px}a.logo{border:0}.btn{display:inline-block;padding:10px 30px;background:#3498db;border:0;color:#fff;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-weight:600;border-radius:3px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:hover{color:#fff;background:#258cd1}.example-audio .player{max-width:520px}.example-video .player{max-width:1200px}.example-audio .player,.example-video .player{margin:0 auto 20px}.example-audio .player-fullscreen,.example-audio .player.fullscreen-active,.example-video .player-fullscreen,.example-video .player.fullscreen-active{max-width:none}footer{margin-bottom:20px}footer p{margin-bottom:10px}
|
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@font-face{font-family:Avenir;src:url(//cdn.plyr.io/fonts/avenir-medium.woff2) format("woff2"),url(//cdn.plyr.io/fonts/avenir-medium.woff) format("woff"),url(//cdn.plyr.io/fonts/avenir-medium.ttf) format("truetype");font-style:normal;font-weight:400}@font-face{font-family:Avenir;src:url(//cdn.plyr.io/fonts/avenir-bold.woff2) format("woff2"),url(//cdn.plyr.io/fonts/avenir-bold.woff) format("woff"),url(//cdn.plyr.io/fonts/avenir-bold.ttf) format("truetype");font-style:normal;font-weight:600}*,::after,::before{box-sizing:border-box}body{font-family:Avenir,"Helvetica Neue",Helvetica,Arial,sans-serif;background:#f2f5f7;line-height:1.5;text-align:center;color:#565d64}.error body,html.error{height:100%}.error body{width:100%;display:table;table-layout:fixed}.error main{display:table-cell;width:100%;vertical-align:middle}h1,h2{letter-spacing:-.025em;color:#2E3C44;margin:0 0 10px;line-height:1.2;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}h1{font-size:64px;font-size:4rem;color:#3498DB}p,small{margin:0 0 20px}small{display:block;padding:0 10px;font-size:14px;font-size:.9rem}header{padding:20px;margin-bottom:20px}header p{font-size:18px;font-size:1.1rem}@media (min-width:560px){header{padding-top:60px;padding-bottom:60px}}section{padding-bottom:20px}@media (min-width:560px){section{padding-bottom:40px}}.actions{list-style:none;margin:0;padding:0;font-size:0}.actions li{display:inline-block;margin-top:10px;font-size:16px;font-size:1rem;white-space:nowrap}.actions li+li{margin-left:20px}a{text-decoration:none;color:#3498db;border-bottom:1px solid currentColor;transition:all .3s ease}a:focus,a:hover{color:#000}a:focus{outline:#343f4a dotted thin;outline-offset:1px}a.logo{border:0}.btn,.btn-count{display:inline-block;vertical-align:middle;border-radius:3px;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-weight:600;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn{padding:10px 20px;background:#3498db;border:0;color:#fff}.btn:focus,.btn:hover{color:#fff;background:#258cd1}.btn-twitter{background:#8799A2}.btn-twitter:focus,.btn-twitter:hover{background:#798d97}.btn-count{position:relative;margin-left:6px;padding:9px;background:#fff;border:1px solid #cbd0d3}.btn-count::before{content:"";position:absolute;display:block;width:8px;height:8px;left:1px;top:50%;margin-top:-4px;background:inherit;border:inherit;border-width:1px 0 0 1px;-webkit-transform:rotate(-45deg) translate(-50%,-50%);transform:rotate(-45deg) translate(-50%,-50%)}.example-audio .player,.example-video .player{margin:0 auto 20px}.example-audio .player-controls,.example-video .player-controls{border-radius:0 0 4px 4px}.example-audio .player{max-width:520px}.example-audio .player-controls{border-radius:4px}.example-audio .player-progress{border-radius:4px 4px 0 0;overflow:hidden}.example-video .player{max-width:1200px}.example-video .player video{border-radius:4px 4px 0 0}.example-video .player-fullscreen,.example-video .player.fullscreen-active{max-width:none}footer{margin-bottom:20px}footer p{margin-bottom:10px}
|
||||||
2
docs/dist/docs.js
vendored
2
docs/dist/docs.js
vendored
File diff suppressed because one or more lines are too long
@ -6,7 +6,7 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
<!-- Docs styles -->
|
<!-- Docs styles -->
|
||||||
<link rel="stylesheet" href="//cdn.plyr.io/1.1.5/docs.css">
|
<link rel="stylesheet" href="//cdn.plyr.io/1.1.13/docs.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<main>
|
<main>
|
||||||
|
|||||||
@ -8,33 +8,40 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
<!-- Styles -->
|
<!-- Styles -->
|
||||||
<link rel="stylesheet" href="//cdn.plyr.io/1.1.5/plyr.css">
|
<link rel="stylesheet" href="https://cdn.plyr.io/1.1.13/plyr.css?1">
|
||||||
|
|
||||||
<!-- Docs styles -->
|
<!-- Docs styles -->
|
||||||
<link rel="stylesheet" href="//cdn.plyr.io/1.1.5/docs.css">
|
<link rel="stylesheet" href="https://cdn.plyr.io/1.1.13/docs.css?2">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header>
|
<header>
|
||||||
<h1>Plyr</h1>
|
<h1>Plyr</h1>
|
||||||
<p>A simple HTML5 media player with custom controls and WebVTT captions.</p>
|
<p>A simple HTML5 media player with custom controls and WebVTT captions by <a href="https://twitter.com/sam_potts" target="_blank">@sam_potts</a></p>
|
||||||
<a href="https://github.com/selz/plyr" target="_blank" class="btn">Download on GitHub</a>
|
<ul class="actions">
|
||||||
|
<li>
|
||||||
|
<a href="https://github.com/selz/plyr" target="_blank" class="btn btn-download">Download on GitHub</a>
|
||||||
|
<span class="btn-count js-stargazers-count">…</span>
|
||||||
|
</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 js-popup" data-window-height="250" data-window-width="500">Tweet</a>
|
||||||
|
<span class="btn-count js-tweet-count">…</span>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<main>
|
<main>
|
||||||
<section class="example-video">
|
<section class="example-video">
|
||||||
<div class="player">
|
<div class="player">
|
||||||
<video poster="//cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
|
<video poster="https://cdn.plyr.io/static/poster.jpg" controls crossorigin>
|
||||||
<!-- Video files -->
|
<!-- Video files -->
|
||||||
<source src="//cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
|
<source src="https://cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
|
||||||
<source src="//cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
|
<source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
|
||||||
|
|
||||||
<!-- Text track file -->
|
<!-- Text track file -->
|
||||||
<track kind="captions" label="English" srclang="en" src="//cdn.selz.com/plyr/1.0/en.vtt" default>
|
<track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/en.vtt" default>
|
||||||
|
|
||||||
<!-- Fallback for browsers that don't support the <video> element -->
|
<!-- Fallback for browsers that don't support the <video> element -->
|
||||||
<div>
|
<a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
|
||||||
<a href="//cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
|
|
||||||
</div>
|
|
||||||
</video>
|
</video>
|
||||||
</div>
|
</div>
|
||||||
<small>Big Buck Bunny. More info can be found at <a href="https://peach.blender.org" target="_blank">peach.blender.org</a>.</small>
|
<small>Big Buck Bunny. More info can be found at <a href="https://peach.blender.org" target="_blank">peach.blender.org</a>.</small>
|
||||||
@ -44,13 +51,11 @@
|
|||||||
<div class="player">
|
<div class="player">
|
||||||
<audio controls>
|
<audio controls>
|
||||||
<!-- Audio files -->
|
<!-- Audio files -->
|
||||||
<source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
|
<source src="https://cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
|
||||||
<source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
|
<source src="https://cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
|
||||||
|
|
||||||
<!-- Fallback for browsers that don't support the <audio> element -->
|
<!-- Fallback for browsers that don't support the <audio> element -->
|
||||||
<div>
|
<a href="https://cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
|
||||||
<a href="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
|
|
||||||
</div>
|
|
||||||
</audio>
|
</audio>
|
||||||
</div>
|
</div>
|
||||||
<small>"96" by Logistics, which can be purchased from <a href="https://www.hospitalrecords.com/shop/artist/logistics" target="_blank">Hospital Records</a>.</small>
|
<small>"96" by Logistics, which can be purchased from <a href="https://www.hospitalrecords.com/shop/artist/logistics" target="_blank">Hospital Records</a>.</small>
|
||||||
@ -83,13 +88,13 @@
|
|||||||
b.insertBefore(c, b.childNodes[0]);
|
b.insertBefore(c, b.childNodes[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})(document, "https://cdn.plyr.io/1.1.5/sprite.svg");
|
})(document, "https://cdn.plyr.io/1.1.13/sprite.svg");
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- Plyr core script -->
|
<!-- Plyr core script -->
|
||||||
<script src="//cdn.plyr.io/1.1.5/plyr.js"></script>
|
<script src="https://cdn.plyr.io/1.1.13/plyr.js?1"></script>
|
||||||
|
|
||||||
<!-- Docs script -->
|
<!-- Docs script -->
|
||||||
<script src="//cdn.plyr.io/1.1.5/docs.js"></script>
|
<script src="https://cdn.plyr.io/1.1.13/docs.js?1"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@ -7,6 +7,7 @@
|
|||||||
// Setup the player
|
// Setup the player
|
||||||
plyr.setup({
|
plyr.setup({
|
||||||
debug: true,
|
debug: true,
|
||||||
|
volume: 9,
|
||||||
title: "Video demo",
|
title: "Video demo",
|
||||||
html: templates.controls.render({}),
|
html: templates.controls.render({}),
|
||||||
captions: {
|
captions: {
|
||||||
@ -25,6 +26,116 @@ plyr.setup({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Popup
|
||||||
|
function popup(event) {
|
||||||
|
// Prevent the link opening
|
||||||
|
if(event.target.nodeName.toLowerCase() == "a") {
|
||||||
|
if(event.preventDefault) {
|
||||||
|
event.preventDefault();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
event.returnValue = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var link = event.target,
|
||||||
|
url = link.href,
|
||||||
|
width = link.getAttribute("data-window-width") || 600,
|
||||||
|
height = link.getAttribute("data-window-height") || 600,
|
||||||
|
name = link.getAttribute("data-window-name") || "popup";
|
||||||
|
|
||||||
|
// If window exists, just focus it
|
||||||
|
if(window["window-"+name] && !window["window-"+name].closed) {
|
||||||
|
window["window-"+name].focus();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Get position
|
||||||
|
var left = window.screenLeft !== undefined ? window.screenLeft : screen.left;
|
||||||
|
var top = window.screenTop !== undefined ? window.screenTop : screen.top;
|
||||||
|
|
||||||
|
// Open in the centre of the screen
|
||||||
|
var x = (screen.width / 2) - (width / 2) + left,
|
||||||
|
y = (screen.height / 2) - (height / 2) + top;
|
||||||
|
|
||||||
|
// Open that window
|
||||||
|
window["window-"+name] = window.open(url, name, "top=" + y +",left="+ x +",width=" + width + ",height=" + height);
|
||||||
|
|
||||||
|
// Focus new window
|
||||||
|
window["window-"+name].focus();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trigger popups
|
||||||
|
document.querySelector(".js-popup").addEventListener("click", popup);
|
||||||
|
|
||||||
|
// Get JSONP
|
||||||
|
function getJSONP(url, callback) {
|
||||||
|
var name = "jsonp_callback_" + Math.round(100000 * Math.random());
|
||||||
|
|
||||||
|
// Cleanup to prevent memory leaks and hit original callback
|
||||||
|
window[name] = function(data) {
|
||||||
|
delete window[name];
|
||||||
|
document.body.removeChild(script);
|
||||||
|
callback(data);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create a faux script
|
||||||
|
var script = document.createElement("script");
|
||||||
|
script.setAttribute("src", url + (url.indexOf("?") >= 0 ? "&" : "?") + "callback=" + name);
|
||||||
|
|
||||||
|
// Inject to the body
|
||||||
|
document.body.appendChild(script);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get star count
|
||||||
|
var storageSupported = ("sessionStorage" in window),
|
||||||
|
selectors = {
|
||||||
|
github: ".js-stargazers-count",
|
||||||
|
twitter: ".js-tweet-count"
|
||||||
|
};
|
||||||
|
|
||||||
|
// Display the count next to the button
|
||||||
|
function displayCount(selector, count) {
|
||||||
|
document.querySelector(selector).innerHTML = count;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add star
|
||||||
|
function formatGitHubCount(count) {
|
||||||
|
return "★ " + count;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if it's in session storage first
|
||||||
|
if(storageSupported && "github_stargazers" in window.sessionStorage) {
|
||||||
|
displayCount(selectors.github, formatGitHubCount(window.sessionStorage.github_stargazers));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
getJSONP("https://api.github.com/repos/selz/plyr?access_token=a46ac653210ba6a6be44260c29c333470c3fbbf5", function (json) {
|
||||||
|
if (json && typeof json.data.stargazers_count !== "undefined") {
|
||||||
|
// Update UI
|
||||||
|
displayCount(selectors.github, formatGitHubCount(json.data.stargazers_count));
|
||||||
|
|
||||||
|
// Store in session storage
|
||||||
|
window.sessionStorage.github_stargazers = json.data.stargazers_count;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get tweet count
|
||||||
|
if(storageSupported && "tweets" in window.sessionStorage) {
|
||||||
|
displayCount(selectors.twitter, window.sessionStorage.tweets);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
getJSONP("https://cdn.api.twitter.com/1/urls/count.json?url=plyr.io", function (json) {
|
||||||
|
if (json && typeof json.count !== "undefined") {
|
||||||
|
// Update UI
|
||||||
|
displayCount(selectors.twitter, json.count);
|
||||||
|
|
||||||
|
// Store in session storage
|
||||||
|
window.sessionStorage.tweets = json.count;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Google analytics
|
// Google analytics
|
||||||
// For demo site (http://[www.]plyr.io) only
|
// For demo site (http://[www.]plyr.io) only
|
||||||
|
|||||||
@ -12,14 +12,16 @@
|
|||||||
// Variables
|
// Variables
|
||||||
// ---------------------------------------
|
// ---------------------------------------
|
||||||
// Colors
|
// Colors
|
||||||
@blue: #3498DB;
|
@blue: #3498db;
|
||||||
@gray-dark: #343f4a;
|
@gray-dark: #343f4a;
|
||||||
@gray: #565d64;
|
@gray: #565d64;
|
||||||
@gray-light: #cbd0d3;
|
@gray-light: #cbd0d3;
|
||||||
|
@off-white: #f2f5f7;
|
||||||
|
|
||||||
// Elements
|
// Elements
|
||||||
@link-color: @blue;
|
@link-color: @blue;
|
||||||
@padding-base: 20px;
|
@padding-base: 20px;
|
||||||
|
@arrow-size: 8px;
|
||||||
|
|
||||||
// Breakpoints
|
// Breakpoints
|
||||||
@screen-md: 768px;
|
@screen-md: 768px;
|
||||||
@ -33,10 +35,10 @@
|
|||||||
// Base
|
// Base
|
||||||
body {
|
body {
|
||||||
font-family: "Avenir", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
font-family: "Avenir", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||||
background: #fff;
|
background: @off-white;
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #6D797F;
|
color: @gray;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Error page
|
// Error page
|
||||||
@ -102,6 +104,22 @@ section {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Links & Buttons
|
// Links & Buttons
|
||||||
|
.actions {
|
||||||
|
list-style: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
font-size: 0;
|
||||||
|
|
||||||
|
li {
|
||||||
|
display: inline-block;
|
||||||
|
margin-top: (@padding-base / 2);
|
||||||
|
.font-size();
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
li + li {
|
||||||
|
margin-left: @padding-base;
|
||||||
|
}
|
||||||
|
}
|
||||||
a {
|
a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: @link-color;
|
color: @link-color;
|
||||||
@ -119,41 +137,93 @@ a {
|
|||||||
border: 0;
|
border: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.btn {
|
.btn,
|
||||||
|
.btn-count {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
padding: (@padding-base / 2) (@padding-base * 1.5);
|
vertical-align: middle;
|
||||||
|
border-radius: 3px;
|
||||||
|
.font-smoothing(on);
|
||||||
|
font-weight: 600;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
.btn {
|
||||||
|
padding: (@padding-base / 2) @padding-base;
|
||||||
background: @link-color;
|
background: @link-color;
|
||||||
border: 0;
|
border: 0;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
.font-smoothing(on);
|
|
||||||
font-weight: 600;
|
|
||||||
border-radius: 3px;
|
|
||||||
user-select: none;
|
|
||||||
|
|
||||||
&:hover,
|
&:hover,
|
||||||
&:focus {
|
&:focus {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: darken(@link-color, 5%);
|
background: darken(@link-color, 5%);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&-twitter {
|
||||||
|
background: #8799A2;
|
||||||
|
|
||||||
|
&:hover,
|
||||||
|
&:focus {
|
||||||
|
background: darken(#8799A2, 5%);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.btn-count {
|
||||||
|
position: relative;
|
||||||
|
margin-left: 6px;
|
||||||
|
padding: ((@padding-base / 2) - 1px);
|
||||||
|
background: #fff;
|
||||||
|
border: 1px solid @gray-light;
|
||||||
|
|
||||||
|
&::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
display: block;
|
||||||
|
width: @arrow-size;
|
||||||
|
height: @arrow-size;
|
||||||
|
left: 1px;
|
||||||
|
top: 50%;
|
||||||
|
margin-top: -(@arrow-size / 2);
|
||||||
|
|
||||||
|
background: inherit;
|
||||||
|
border: inherit;
|
||||||
|
border-width: 1px 0 0 1px;
|
||||||
|
transform: rotate(-45deg) translate(-50%, -50%);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Players
|
// Example players
|
||||||
.example-audio .player {
|
|
||||||
max-width: 520px;
|
|
||||||
}
|
|
||||||
.example-video .player {
|
|
||||||
max-width: 1200px;
|
|
||||||
}
|
|
||||||
.example-audio .player,
|
.example-audio .player,
|
||||||
.example-video .player {
|
.example-video .player {
|
||||||
margin: 0 auto @padding-base;
|
margin: 0 auto @padding-base;
|
||||||
|
|
||||||
|
&-controls {
|
||||||
|
border-radius: 0 0 4px 4px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.example-audio .player {
|
||||||
|
max-width: 520px;
|
||||||
|
|
||||||
|
&-controls {
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
&-progress {
|
||||||
|
border-radius: 4px 4px 0 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.example-video .player {
|
||||||
|
max-width: 1200px;
|
||||||
|
|
||||||
|
video {
|
||||||
|
border-radius: 4px 4px 0 0;
|
||||||
|
}
|
||||||
&-fullscreen,
|
&-fullscreen,
|
||||||
&.fullscreen-active {
|
&.fullscreen-active {
|
||||||
max-width: none;
|
max-width: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Footer
|
// Footer
|
||||||
footer {
|
footer {
|
||||||
margin-bottom: @padding-base;
|
margin-bottom: @padding-base;
|
||||||
|
|||||||
@ -272,5 +272,5 @@ gulp.task("open", function () {
|
|||||||
|
|
||||||
// Do everything
|
// Do everything
|
||||||
gulp.task("publish", function () {
|
gulp.task("publish", function () {
|
||||||
run("templates", tasks.js, tasks.less, "sprite", "cdn", "docs", "open");
|
run("templates", tasks.js, tasks.less, "sprite", "cdn", "docs");
|
||||||
});
|
});
|
||||||
14
package.json
14
package.json
@ -1,18 +1,18 @@
|
|||||||
{
|
{
|
||||||
"name": "plyr",
|
"name": "plyr",
|
||||||
"version": "1.1.5",
|
"version": "1.1.13",
|
||||||
"description": "A simple HTML5 media player using custom controls",
|
"description": "A simple HTML5 media player using custom controls",
|
||||||
"homepage": "http://plyr.io",
|
"homepage": "http://plyr.io",
|
||||||
"main": "gulpfile.js",
|
"main": "gulpfile.js",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"gulp": "~3.8.6",
|
"gulp": "^3.8.6",
|
||||||
"gulp-autoprefixer": "^0.0.8",
|
"gulp-autoprefixer": "^0.0.8",
|
||||||
"gulp-concat": "~2.3.3",
|
"gulp-concat": "^2.3.3",
|
||||||
"gulp-gzip": "^1.0.0",
|
"gulp-gzip": "^1.0.0",
|
||||||
"gulp-hogan-compile": "^0.4.1",
|
"gulp-hogan-compile": "^0.4.1",
|
||||||
"gulp-less": "~1.3.1",
|
"gulp-less": "^1.3.1",
|
||||||
"gulp-minify-css": "~0.3.6",
|
"gulp-minify-css": "^0.3.6",
|
||||||
"gulp-open": "^0.3.2",
|
"gulp-open": "^0.3.2",
|
||||||
"gulp-rename": "^1.2.0",
|
"gulp-rename": "^1.2.0",
|
||||||
"gulp-replace": "^0.5.3",
|
"gulp-replace": "^0.5.3",
|
||||||
@ -21,8 +21,8 @@
|
|||||||
"gulp-size": "^1.2.1",
|
"gulp-size": "^1.2.1",
|
||||||
"gulp-svgmin": "^1.0.0",
|
"gulp-svgmin": "^1.0.0",
|
||||||
"gulp-svgstore": "^5.0.0",
|
"gulp-svgstore": "^5.0.0",
|
||||||
"gulp-uglify": "~0.3.1",
|
"gulp-uglify": "^0.3.1",
|
||||||
"gulp-util": "~2.2.20",
|
"gulp-util": "^2.2.20",
|
||||||
"run-sequence": "^0.3.6"
|
"run-sequence": "^0.3.6"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
45
readme.md
45
readme.md
@ -37,7 +37,7 @@ If you have any cool ideas or features, please let me know by [creating an issue
|
|||||||
|
|
||||||
Check `docs/index.html` and `docs/dist/docs.js` for an example setup.
|
Check `docs/index.html` and `docs/dist/docs.js` for an example setup.
|
||||||
|
|
||||||
**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.1.5/plyr.js` to `https://cdn.plyr.io/1.1.5/plyr.js`
|
**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.1.13/plyr.js` to `https://cdn.plyr.io/1.1.13/plyr.js`
|
||||||
|
|
||||||
### Bower
|
### Bower
|
||||||
If bower is your thang, you can grab Plyr using:
|
If bower is your thang, you can grab Plyr using:
|
||||||
@ -54,14 +54,14 @@ ember addon:install ember-cli-plyr
|
|||||||
More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub](https://github.com/louisrudner/ember-cli-plyr)
|
More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub](https://github.com/louisrudner/ember-cli-plyr)
|
||||||
|
|
||||||
### CDN
|
### CDN
|
||||||
If you want to use our CDN, you can use the following. HTTPS (SSL) is supported.
|
If you want to use our CDN, you can use the following:
|
||||||
|
|
||||||
```html
|
```html
|
||||||
<link rel="stylesheet" href="//cdn.plyr.io/1.1.5/plyr.css">
|
<link rel="stylesheet" href="https://cdn.plyr.io/1.1.13/plyr.css">
|
||||||
<script src="//cdn.plyr.io/1.1.5/plyr.js"></script>
|
<script src="https://cdn.plyr.io/1.1.13/plyr.js"></script>
|
||||||
```
|
```
|
||||||
|
|
||||||
You can also access the `sprite.svg` file at `//cdn.plyr.io/1.1.5/sprite.svg`.
|
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.1.13/sprite.svg`.
|
||||||
|
|
||||||
### CSS
|
### CSS
|
||||||
If you want to use the default css, add the `plyr.css` file from /dist into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request.
|
If you want to use the default css, add the `plyr.css` file from /dist into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request.
|
||||||
@ -98,18 +98,16 @@ and the AJAX technique here:
|
|||||||
The only extra markup that's needed to use plyr is a `<div>` wrapper. Replace the source, poster and captions with urls for your media.
|
The only extra markup that's needed to use plyr is a `<div>` wrapper. Replace the source, poster and captions with urls for your media.
|
||||||
```html
|
```html
|
||||||
<div class="player">
|
<div class="player">
|
||||||
<video poster="//cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
|
<video poster="https://cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
|
||||||
<!-- Video files -->
|
<!-- Video files -->
|
||||||
<source src="//cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
|
<source src="https://cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
|
||||||
<source src="//cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
|
<source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
|
||||||
|
|
||||||
<!-- Text track file -->
|
<!-- Text track file -->
|
||||||
<track kind="captions" label="English captions" src="//cdn.selz.com/plyr/1.0/movie_captions_en.vtt" srclang="en" default>
|
<track kind="captions" label="English captions" src="https://cdn.selz.com/plyr/1.0/movie_captions_en.vtt" srclang="en" default>
|
||||||
|
|
||||||
<!-- Fallback for browsers that don't support the <video> element -->
|
<!-- Fallback for browsers that don't support the <video> element -->
|
||||||
<div>
|
<a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
|
||||||
<a href="//cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
|
|
||||||
</div>
|
|
||||||
</video>
|
</video>
|
||||||
</div>
|
</div>
|
||||||
```
|
```
|
||||||
@ -119,13 +117,11 @@ And the same for `<audio>`
|
|||||||
<div class="player">
|
<div class="player">
|
||||||
<audio controls>
|
<audio controls>
|
||||||
<!-- Audio files -->
|
<!-- Audio files -->
|
||||||
<source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
|
<source src="https://cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
|
||||||
<source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
|
<source src="https://cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
|
||||||
|
|
||||||
<!-- Fallback for browsers that don't support the <audio> element -->
|
<!-- Fallback for browsers that don't support the <audio> element -->
|
||||||
<div>
|
<a href="https://cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
|
||||||
<a href="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
|
|
||||||
</div>
|
|
||||||
</audio>
|
</audio>
|
||||||
</div>
|
</div>
|
||||||
```
|
```
|
||||||
@ -305,6 +301,11 @@ Here's a list of the methods supported:
|
|||||||
<td>Number</td>
|
<td>Number</td>
|
||||||
<td>Sets the player volume to the provided parameter. The value should be between 0 (muted) and 10 (loudest). If no parameter is provided, the default volume is used (5). Values over 10 are ignored.</td>
|
<td>Sets the player volume to the provided parameter. The value should be between 0 (muted) and 10 (loudest). If no parameter is provided, the default volume is used (5). Values over 10 are ignored.</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><code>togglePlay()</code></td>
|
||||||
|
<td>Boolean</td>
|
||||||
|
<td>Toggles playback for the player based on either the boolean argument or it's current state.</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><code>toggleMute()</code></td>
|
<td><code>toggleMute()</code></td>
|
||||||
<td>—</td>
|
<td>—</td>
|
||||||
@ -350,6 +351,16 @@ Here's a list of the methods supported:
|
|||||||
<td>String</td>
|
<td>String</td>
|
||||||
<td>Set the poster url. This is supported for the <code>video</code> element only.</td>
|
<td>Set the poster url. This is supported for the <code>video</code> element only.</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><code>destroy()</code></td>
|
||||||
|
<td>—</td>
|
||||||
|
<td>Destroys the plyr UI and any media event listeners, effectively restoring to the previous state before <code>setup()</code> was called.</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><code>restore()</code></td>
|
||||||
|
<td>—</td>
|
||||||
|
<td>Reverses the effects of the <code>destroy()</code> method, restoring the UI and listeners.</td>
|
||||||
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|||||||
213
src/js/plyr.js
213
src/js/plyr.js
@ -1,6 +1,6 @@
|
|||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
// Plyr
|
// Plyr
|
||||||
// plyr.js v1.1.5
|
// plyr.js v1.1.13
|
||||||
// https://github.com/selz/plyr
|
// https://github.com/selz/plyr
|
||||||
// License: The MIT License (MIT)
|
// License: The MIT License (MIT)
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@ -383,12 +383,28 @@
|
|||||||
// append it to the parent.
|
// append it to the parent.
|
||||||
if (sibling) {
|
if (sibling) {
|
||||||
parent.insertBefore(child, sibling);
|
parent.insertBefore(child, sibling);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
parent.appendChild(child);
|
parent.appendChild(child);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Unwrap an element
|
||||||
|
// http://plainjs.com/javascript/manipulation/unwrap-a-dom-element-35/
|
||||||
|
function _unwrap(wrapper) {
|
||||||
|
// Get the element's parent node
|
||||||
|
var parent = wrapper.parentNode;
|
||||||
|
|
||||||
|
// Move all children out of the element
|
||||||
|
while (wrapper.firstChild) {
|
||||||
|
parent.insertBefore(wrapper.firstChild, wrapper);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove the empty element
|
||||||
|
parent.removeChild(wrapper);
|
||||||
|
}
|
||||||
|
|
||||||
// Remove an element
|
// Remove an element
|
||||||
function _remove(element) {
|
function _remove(element) {
|
||||||
element.parentNode.removeChild(element);
|
element.parentNode.removeChild(element);
|
||||||
@ -421,7 +437,7 @@
|
|||||||
|
|
||||||
// Toggle event
|
// Toggle event
|
||||||
function _toggleHandler(element, events, callback, toggle) {
|
function _toggleHandler(element, events, callback, toggle) {
|
||||||
events = events.split(" ");
|
var eventList = events.split(" ");
|
||||||
|
|
||||||
// If a nodelist is passed, call itself on each node
|
// If a nodelist is passed, call itself on each node
|
||||||
if(element instanceof NodeList) {
|
if(element instanceof NodeList) {
|
||||||
@ -434,8 +450,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If a single node is passed, bind the event listener
|
// If a single node is passed, bind the event listener
|
||||||
for (var i = 0; i < events.length; i++) {
|
for (var i = 0; i < eventList.length; i++) {
|
||||||
element[toggle ? "addEventListener" : "removeEventListener"](events[i], callback, false);
|
element[toggle ? "addEventListener" : "removeEventListener"](eventList[i], callback, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -952,13 +968,13 @@
|
|||||||
// Enable UI
|
// Enable UI
|
||||||
_showCaptions(player);
|
_showCaptions(player);
|
||||||
|
|
||||||
// If IE 10/11 or Firefox 31+ or Safari 7+, don"t use native captioning (still doesn"t work although they claim it"s now supported)
|
// Disable unsupported browsers than report false positive
|
||||||
if ((player.browser.name === "IE" && player.browser.version === 10) ||
|
if ((player.browser.name === "IE" && player.browser.version >= 10) ||
|
||||||
(player.browser.name === "IE" && player.browser.version === 11) ||
|
(player.browser.name === "Firefox" && player.browser.version >= 31) ||
|
||||||
(player.browser.name === "Firefox" && player.browser.version >= 31) ||
|
(player.browser.name === "Chrome" && player.browser.version >= 43) ||
|
||||||
(player.browser.name === "Safari" && player.browser.version >= 7)) {
|
(player.browser.name === "Safari" && player.browser.version >= 7)) {
|
||||||
// Debugging
|
// Debugging
|
||||||
_log("Detected IE 10/11 or Firefox 31+ or Safari 7+.");
|
_log("Detected unsupported browser for HTML5 captions. Using fallback.");
|
||||||
|
|
||||||
// Set to false so skips to "manual" captioning
|
// Set to false so skips to "manual" captioning
|
||||||
player.usingTextTracks = false;
|
player.usingTextTracks = false;
|
||||||
@ -1078,6 +1094,22 @@
|
|||||||
player.media.pause();
|
player.media.pause();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Toggle playback
|
||||||
|
function _togglePlay(toggle) {
|
||||||
|
// Play
|
||||||
|
if(toggle === true) {
|
||||||
|
_play();
|
||||||
|
}
|
||||||
|
// Pause
|
||||||
|
else if(toggle === false) {
|
||||||
|
_pause();
|
||||||
|
}
|
||||||
|
// True toggle
|
||||||
|
else {
|
||||||
|
player.media[player.media.paused ? "play" : "pause"]();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Rewind
|
// Rewind
|
||||||
function _rewind(seekTime) {
|
function _rewind(seekTime) {
|
||||||
// Use default if needed
|
// Use default if needed
|
||||||
@ -1181,9 +1213,39 @@
|
|||||||
// Set class hook
|
// Set class hook
|
||||||
_toggleClass(player.container, config.classes.fullscreen.active, player.isFullscreen);
|
_toggleClass(player.container, config.classes.fullscreen.active, player.isFullscreen);
|
||||||
|
|
||||||
// Remove hover class because mouseleave doesn't occur
|
// Toggle controls visibility based on mouse movement and location
|
||||||
if (player.isFullscreen) {
|
var hoverTimer, isMouseOver = false;
|
||||||
|
|
||||||
|
// Show the player controls
|
||||||
|
function _showControls() {
|
||||||
|
// Set shown class
|
||||||
|
_toggleClass(player.controls, config.classes.hover, true);
|
||||||
|
|
||||||
|
// Clear timer every movement
|
||||||
|
window.clearTimeout(hoverTimer);
|
||||||
|
|
||||||
|
// If the mouse is not over the controls, set a timeout to hide them
|
||||||
|
if(!isMouseOver) {
|
||||||
|
hoverTimer = window.setTimeout(function() {
|
||||||
|
_toggleClass(player.controls, config.classes.hover, false);
|
||||||
|
}, 2000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check mouse is over the controls
|
||||||
|
function _setMouseOver (event) {
|
||||||
|
isMouseOver = (event.type === "mouseenter");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(config.fullscreen.hideControls) {
|
||||||
|
// Hide on entering full screen
|
||||||
_toggleClass(player.controls, config.classes.hover, false);
|
_toggleClass(player.controls, config.classes.hover, false);
|
||||||
|
|
||||||
|
// Keep an eye on the mouse location in relation to controls
|
||||||
|
_toggleHandler(player.controls, "mouseenter mouseleave", _setMouseOver, player.isFullscreen);
|
||||||
|
|
||||||
|
// Show the controls on mouse move
|
||||||
|
_toggleHandler(player.container, "mousemove", _showControls, player.isFullscreen);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1197,12 +1259,7 @@
|
|||||||
|
|
||||||
// Set volume
|
// Set volume
|
||||||
function _setVolume(volume) {
|
function _setVolume(volume) {
|
||||||
// Bail if there's no volume element
|
// Use default if no value specified
|
||||||
if(!player.volume) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use default if needed
|
|
||||||
if(typeof volume === "undefined") {
|
if(typeof volume === "undefined") {
|
||||||
if(config.storage.enabled && _storage().supported) {
|
if(config.storage.enabled && _storage().supported) {
|
||||||
volume = window.localStorage[config.storage.key] || config.volume;
|
volume = window.localStorage[config.storage.key] || config.volume;
|
||||||
@ -1211,25 +1268,22 @@
|
|||||||
volume = config.volume;
|
volume = config.volume;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Maximum is 10
|
// Maximum is 10
|
||||||
if(volume > 10) {
|
if(volume > 10) {
|
||||||
volume = 10;
|
volume = 10;
|
||||||
}
|
}
|
||||||
|
// Minimum is 0
|
||||||
// If the controls are there
|
if(volume < 0) {
|
||||||
if(player.supported.full) {
|
volume = 0;
|
||||||
player.volume.value = volume;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set the player volume
|
// Set the player volume
|
||||||
player.media.volume = parseFloat(volume / 10);
|
player.media.volume = parseFloat(volume / 10);
|
||||||
|
|
||||||
// Update the UI
|
// Toggle muted state
|
||||||
_checkMute();
|
if(player.media.muted && volume > 0) {
|
||||||
|
_toggleMute();
|
||||||
// Store the volume in storage
|
|
||||||
if(config.storage.enabled && _storage().supported) {
|
|
||||||
window.localStorage.setItem(config.storage.key, volume);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1240,16 +1294,32 @@
|
|||||||
muted = !player.media.muted;
|
muted = !player.media.muted;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the controls are there
|
|
||||||
if(player.supported.full) {
|
|
||||||
player.buttons.mute.checked = muted;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set mute on the player
|
// Set mute on the player
|
||||||
player.media.muted = muted;
|
player.media.muted = muted;
|
||||||
|
}
|
||||||
|
|
||||||
// Update UI
|
// Update volume UI and storage
|
||||||
_checkMute();
|
function _updateVolume() {
|
||||||
|
// Get the current volume
|
||||||
|
var volume = player.media.muted ? 0 : (player.media.volume * 10);
|
||||||
|
|
||||||
|
// Update the <input type="range"> if present
|
||||||
|
if(player.supported.full && player.volume) {
|
||||||
|
player.volume.value = volume;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store the volume in storage
|
||||||
|
if(config.storage.enabled && _storage().supported) {
|
||||||
|
window.localStorage.setItem(config.storage.key, volume);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Toggle class if muted
|
||||||
|
_toggleClass(player.container, config.classes.muted, (volume === 0));
|
||||||
|
|
||||||
|
// Update checkbox for mute state
|
||||||
|
if(player.supported.full && player.buttons.mute) {
|
||||||
|
player.buttons.mute.checked = (volume === 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Toggle captions
|
// Toggle captions
|
||||||
@ -1268,11 +1338,6 @@
|
|||||||
_toggleClass(player.container, config.classes.captions.active, show);
|
_toggleClass(player.container, config.classes.captions.active, show);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check mute state
|
|
||||||
function _checkMute() {
|
|
||||||
_toggleClass(player.container, config.classes.muted, (player.media.volume === 0 || player.media.muted));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if media is loading
|
// Check if media is loading
|
||||||
function _checkLoading(event) {
|
function _checkLoading(event) {
|
||||||
var loading = (event.type === "waiting");
|
var loading = (event.type === "waiting");
|
||||||
@ -1544,7 +1609,7 @@
|
|||||||
_on(player.media, "playing", _updateProgress);
|
_on(player.media, "playing", _updateProgress);
|
||||||
|
|
||||||
// Handle native mute
|
// Handle native mute
|
||||||
_on(player.media, "volumechange", _checkMute);
|
_on(player.media, "volumechange", _updateVolume);
|
||||||
|
|
||||||
// Handle native play/pause
|
// Handle native play/pause
|
||||||
_on(player.media, "play pause", _checkPlaying);
|
_on(player.media, "play pause", _checkPlaying);
|
||||||
@ -1570,16 +1635,52 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bind to mouse hover
|
|
||||||
if(config.fullscreen.hideControls) {
|
|
||||||
_on(player.controls, "mouseenter mouseleave", function(event) {
|
|
||||||
_toggleClass(player.controls, config.classes.hover, (event.type === "mouseenter"));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Destroy an instance
|
||||||
|
function _destroy() {
|
||||||
|
// Bail if the element is not initialized
|
||||||
|
if(!player.init) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset container classname
|
||||||
|
player.container.setAttribute("class", config.selectors.container.replace(".", ""));
|
||||||
|
|
||||||
|
// 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
|
||||||
|
|
||||||
|
// Remove controls
|
||||||
|
_remove(_getElement(config.selectors.controls));
|
||||||
|
|
||||||
|
// If video, we need to remove some more
|
||||||
|
if(player.type === "video") {
|
||||||
|
// Remove captions
|
||||||
|
_remove(_getElement(config.selectors.captions));
|
||||||
|
|
||||||
|
// Remove video wrapper
|
||||||
|
_unwrap(player.videoContainer);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Restore native video controls
|
||||||
|
player.media.setAttribute("controls", "");
|
||||||
|
|
||||||
|
// Clone the media element to remove listeners
|
||||||
|
// http://stackoverflow.com/questions/19469881/javascript-remove-all-event-listeners-of-specific-type
|
||||||
|
var clone = player.media.cloneNode(true);
|
||||||
|
player.media.parentNode.replaceChild(clone, player.media);
|
||||||
|
|
||||||
|
// Remove init flag
|
||||||
|
player.init = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Setup a player
|
||||||
function _init() {
|
function _init() {
|
||||||
|
// Bail if the element is initialized
|
||||||
|
if(player.init) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
// Setup the fullscreen api
|
// Setup the fullscreen api
|
||||||
fullscreen = _fullscreen();
|
fullscreen = _fullscreen();
|
||||||
|
|
||||||
@ -1631,6 +1732,7 @@
|
|||||||
|
|
||||||
// Set volume
|
// Set volume
|
||||||
_setVolume();
|
_setVolume();
|
||||||
|
_updateVolume();
|
||||||
|
|
||||||
// Setup fullscreen
|
// Setup fullscreen
|
||||||
_setupFullscreen();
|
_setupFullscreen();
|
||||||
@ -1640,10 +1742,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Successful setup
|
// Successful setup
|
||||||
return true;
|
player.init = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!_init()) {
|
// Initialize instance
|
||||||
|
_init();
|
||||||
|
|
||||||
|
// If init failed, return an empty object
|
||||||
|
if(!player.init) {
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1658,11 +1764,14 @@
|
|||||||
source: _parseSource,
|
source: _parseSource,
|
||||||
poster: _updatePoster,
|
poster: _updatePoster,
|
||||||
setVolume: _setVolume,
|
setVolume: _setVolume,
|
||||||
|
togglePlay: _togglePlay,
|
||||||
toggleMute: _toggleMute,
|
toggleMute: _toggleMute,
|
||||||
toggleCaptions: _toggleCaptions,
|
toggleCaptions: _toggleCaptions,
|
||||||
toggleFullscreen: _toggleFullscreen,
|
toggleFullscreen: _toggleFullscreen,
|
||||||
isFullscreen: function() { return player.isFullscreen || false; },
|
isFullscreen: function() { return player.isFullscreen || false; },
|
||||||
support: function(mimeType) { return _supportMime(player, mimeType); }
|
support: function(mimeType) { return _supportMime(player, mimeType); },
|
||||||
|
destroy: _destroy,
|
||||||
|
restore: _init
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -478,7 +478,8 @@
|
|||||||
margin: 0 @control-spacing 0 0;
|
margin: 0 @control-spacing 0 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
background: none;
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
|
||||||
// Webkit
|
// Webkit
|
||||||
&::-webkit-slider-runnable-track {
|
&::-webkit-slider-runnable-track {
|
||||||
@ -578,12 +579,9 @@
|
|||||||
top: auto;
|
top: auto;
|
||||||
bottom: 90px;
|
bottom: 90px;
|
||||||
|
|
||||||
@media (min-width: @bp-control-split) and (max-width: (@bp-captions-large - 1)) {
|
@media (min-width: @bp-control-split) {
|
||||||
bottom: 60px;
|
bottom: 60px;
|
||||||
}
|
}
|
||||||
@media (min-width: @bp-captions-large) {
|
|
||||||
bottom: 80px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.player-controls {
|
.player-controls {
|
||||||
@ -596,11 +594,10 @@
|
|||||||
// Hide controls when playing in full screen
|
// Hide controls when playing in full screen
|
||||||
&.fullscreen-hide-controls.playing .player-controls {
|
&.fullscreen-hide-controls.playing .player-controls {
|
||||||
transform: translateY(100%) translateY(@control-spacing / 2);
|
transform: translateY(100%) translateY(@control-spacing / 2);
|
||||||
transition: transform .3s 1s ease;
|
transition: transform .3s .2s ease;
|
||||||
|
|
||||||
&.hover {
|
&.hover {
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
transition-delay: 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -471,7 +471,8 @@ $bp-captions-large: 768px !default; // When captions jump to the larger fo
|
|||||||
margin: 0 $control-spacing 0 0;
|
margin: 0 $control-spacing 0 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
background: none;
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
|
||||||
// Webkit
|
// Webkit
|
||||||
&::-webkit-slider-runnable-track {
|
&::-webkit-slider-runnable-track {
|
||||||
@ -571,12 +572,9 @@ $bp-captions-large: 768px !default; // When captions jump to the larger fo
|
|||||||
top: auto;
|
top: auto;
|
||||||
bottom: 90px;
|
bottom: 90px;
|
||||||
|
|
||||||
@media (min-width: $bp-control-split) and (max-width: ($bp-captions-large - 1)) {
|
@media (min-width: $bp-control-split) {
|
||||||
bottom: 60px;
|
bottom: 60px;
|
||||||
}
|
}
|
||||||
@media (min-width: $bp-captions-large) {
|
|
||||||
bottom: 80px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.player-controls {
|
.player-controls {
|
||||||
@ -589,11 +587,10 @@ $bp-captions-large: 768px !default; // When captions jump to the larger fo
|
|||||||
// Hide controls when playing in full screen
|
// Hide controls when playing in full screen
|
||||||
&.fullscreen-hide-controls.playing .player-controls {
|
&.fullscreen-hide-controls.playing .player-controls {
|
||||||
transform: translateY(100%) translateY($control-spacing / 2);
|
transform: translateY(100%) translateY($control-spacing / 2);
|
||||||
transition: transform .3s 1s ease;
|
transition: transform .3s .2s ease;
|
||||||
|
|
||||||
&.hover {
|
&.hover {
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
transition-delay: 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user