Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Sam Potts
|
66969f1a65 | ||
|
Sam Potts
|
e964c1a298 | ||
|
Sam Potts
|
6543fc1e5b | ||
|
Sam Potts
|
9133247cdf | ||
 Sam Potts
|
bf7f6f40bd | ||
 Calvin Tam
|
43a904917f | ||
|
Calvin Tam
|
9fe6e5ffcb | ||
|
Calvin Tam
|
a46e421bf6 | ||
|
Calvin Tam
|
20090aee03 | ||
|
Calvin Tam
|
c4ca7fe0d2 | ||
|
Calvin Tam
|
6b41752415 | ||
|
Calvin Tam
|
2bc53d12ea | ||
|
Calvin Tam
|
2f6dc5279b | ||
|
Calvin Tam
|
c8b2867b1f | ||
|
Calvin Tam
|
e56132ae3b | ||
|
Sam Potts
|
45d4091c20 | ||
|
Sam Potts
|
60c53a5894 | ||
|
Sam Potts
|
032c823d3a | ||
 khrizpv
|
66f724a3be | ||
|
Sam Potts
|
bf0c81b484 | ||
|
Sam Potts
|
aa72a17f44 |
@@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
# v1.3.5
|
||||||
|
- Fixed bug with API use on basic supported browsers
|
||||||
|
|
||||||
|
# v1.3.4
|
||||||
|
- Code cleanup by @calvintam236
|
||||||
|
|
||||||
|
# v1.3.3
|
||||||
|
- Removed captions being read by screen readers
|
||||||
|
|
||||||
# v1.3.2
|
# v1.3.2
|
||||||
- Voiceover fix for captions
|
- Voiceover fix for captions
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -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.3.2/docs.css">
|
<link rel="stylesheet" href="//cdn.plyr.io/1.3.6/docs.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<main>
|
<main>
|
||||||
|
|||||||
+9
-9
@@ -8,15 +8,15 @@
|
|||||||
<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="https://cdn.plyr.io/1.3.2/plyr.css?3">
|
<link rel="stylesheet" href="https://cdn.plyr.io/1.3.6/plyr.css">
|
||||||
|
|
||||||
<!-- Docs styles -->
|
<!-- Docs styles -->
|
||||||
<link rel="stylesheet" href="https://cdn.plyr.io/1.3.2/docs.css?1">
|
<link rel="stylesheet" href="https://cdn.plyr.io/1.3.6/docs.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header>
|
<header>
|
||||||
<h1>Plyr</h1>
|
<h1>Plyr</h1>
|
||||||
<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>
|
<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> from <a href="https://twitter.com/selz" target="_blank">@selz</a></p>
|
||||||
<nav>
|
<nav>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
<span class="btn-count js-stargazers-count">…</span>
|
<span class="btn-count js-stargazers-count">…</span>
|
||||||
</li>
|
</li>
|
||||||
<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 js-popup" data-window-height="250" data-window-width="500">Tweet</a>
|
<a href="https://twitter.com/intent/tweet?text=A+simple+HTML5+media+player+with+custom+controls+and+WebVTT+captions.&url=https%3A%2F%2Fplyr.io&via=Sam_Potts" target="_blank" class="btn js-popup" data-window-height="250" data-window-width="500">Tweet</a>
|
||||||
<span class="btn-count js-tweet-count">…</span>
|
<span class="btn-count js-tweet-count">…</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -42,13 +42,13 @@
|
|||||||
<div class="panels">
|
<div class="panels">
|
||||||
<section class="panel example-video active" id="video">
|
<section class="panel example-video active" id="video">
|
||||||
<div class="player">
|
<div class="player">
|
||||||
<video poster="https://cdn.plyr.io/static/poster.jpg" controls crossorigin>
|
<video poster="poster.jpg" controls crossorigin>
|
||||||
<!-- Video files -->
|
<!-- 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.mp4" type="video/mp4">
|
||||||
<source src="https://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="https://cdn.selz.com/plyr/1.0/en.vtt?2" default>
|
<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 -->
|
<!-- Fallback for browsers that don't support the <video> element -->
|
||||||
<a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
|
<a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
|
||||||
@@ -97,13 +97,13 @@
|
|||||||
b.insertBefore(c, b.childNodes[0]);
|
b.insertBefore(c, b.childNodes[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})(document, "https://cdn.plyr.io/1.3.2/sprite.svg");
|
})(document, "https://cdn.plyr.io/1.3.6/sprite.svg");
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- Plyr core script -->
|
<!-- Plyr core script -->
|
||||||
<script src="https://cdn.plyr.io/1.3.2/plyr.js?1"></script>
|
<script src="https://cdn.plyr.io/1.3.6/plyr.js"></script>
|
||||||
|
|
||||||
<!-- Docs script -->
|
<!-- Docs script -->
|
||||||
<script src="https://cdn.plyr.io/1.3.2/docs.js?1"></script>
|
<script src="https://cdn.plyr.io/1.3.6/docs.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 171 KiB |
+12
-3
@@ -66,7 +66,12 @@ package = loadJSON(path.join(root, "package.json"));
|
|||||||
|
|
||||||
// Load json
|
// Load json
|
||||||
function loadJSON(path) {
|
function loadJSON(path) {
|
||||||
return JSON.parse(fs.readFileSync(path));
|
try {
|
||||||
|
return JSON.parse(fs.readFileSync(path));
|
||||||
|
}
|
||||||
|
catch(err) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var build = {
|
var build = {
|
||||||
@@ -215,8 +220,12 @@ options = {
|
|||||||
},
|
},
|
||||||
gzippedOnly: true
|
gzippedOnly: true
|
||||||
}
|
}
|
||||||
},
|
};
|
||||||
cdnpath = new RegExp(aws.cdn.bucket + "\/(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)","gi");
|
|
||||||
|
// If aws is setup
|
||||||
|
if("cdn" in aws) {
|
||||||
|
var cdnpath = new RegExp(aws.cdn.bucket + "\/(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)","gi");
|
||||||
|
}
|
||||||
|
|
||||||
// Publish version to CDN bucket
|
// Publish version to CDN bucket
|
||||||
gulp.task("cdn", function () {
|
gulp.task("cdn", function () {
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "plyr",
|
"name": "plyr",
|
||||||
"version": "1.3.2",
|
"version": "1.3.6",
|
||||||
"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",
|
||||||
|
|||||||
@@ -40,7 +40,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.3.2/plyr.js` to `https://cdn.plyr.io/1.3.2/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.3.6/plyr.js` to `https://cdn.plyr.io/1.3.6/plyr.js`
|
||||||
|
|
||||||
### Bower
|
### Bower
|
||||||
If bower is your thang, you can grab Plyr using:
|
If bower is your thang, you can grab Plyr using:
|
||||||
@@ -60,11 +60,11 @@ More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub]
|
|||||||
If you want to use our CDN, you can use the following:
|
If you want to use our CDN, you can use the following:
|
||||||
|
|
||||||
```html
|
```html
|
||||||
<link rel="stylesheet" href="https://cdn.plyr.io/1.3.2/plyr.css">
|
<link rel="stylesheet" href="https://cdn.plyr.io/1.3.6/plyr.css">
|
||||||
<script src="https://cdn.plyr.io/1.3.2/plyr.js"></script>
|
<script src="https://cdn.plyr.io/1.3.6/plyr.js"></script>
|
||||||
```
|
```
|
||||||
|
|
||||||
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.3.2/sprite.svg`.
|
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.3.6/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.
|
||||||
|
|||||||
+484
-472
File diff suppressed because it is too large
Load Diff
+4
-4
@@ -19,9 +19,9 @@ $font-size-small: 14px !default;
|
|||||||
$font-size-base: 16px !default;
|
$font-size-base: 16px !default;
|
||||||
|
|
||||||
// Captions
|
// Captions
|
||||||
$font-size-captions-base: ceil(@font-size-base * 1.25) !default;
|
$font-size-captions-base: ceil($font-size-base * 1.25) !default;
|
||||||
$font-size-captions-medium: ceil(@font-size-base * 1.5) !default;
|
$font-size-captions-medium: ceil($font-size-base * 1.5) !default;
|
||||||
$font-size-captions-large: (@font-size-base * 2) !default;
|
$font-size-captions-large: ($font-size-base * 2) !default;
|
||||||
|
|
||||||
// Controls
|
// Controls
|
||||||
$control-spacing: 10px !default;
|
$control-spacing: 10px !default;
|
||||||
@@ -211,7 +211,7 @@ $bp-captions-large: 768px !default; // When captions jump to the larger
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: @bp-captions-large) {
|
@media (min-width: $bp-captions-large) {
|
||||||
font-size: $font-size-captions-medium;
|
font-size: $font-size-captions-medium;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user