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

Fixes bug with 1.1.8 volume

Browse Source
This commit is contained in:
Sam Potts 2015-05-18 14:43:45 +10:00
parent ceace2a678
commit 19d7522722
6 changed files with 20 additions and 18 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

2
docs/error.html
View File

@ -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.8/docs.css"> <link rel="stylesheet" href="//cdn.plyr.io/1.1.9/docs.css">
</head> </head>
<body> <body>
<main> <main>

10
docs/index.html
View File

@ -8,10 +8,10 @@
<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.1.8/plyr.css"> <link rel="stylesheet" href="https://cdn.plyr.io/1.1.9/plyr.css">
<!-- Docs styles --> <!-- Docs styles -->
<link rel="stylesheet" href="https://cdn.plyr.io/1.1.8/docs.css"> <link rel="stylesheet" href="https://cdn.plyr.io/1.1.9/docs.css">
</head> </head>
<body> <body>
<header> <header>
@ -79,13 +79,13 @@
b.insertBefore(c, b.childNodes[0]); b.insertBefore(c, b.childNodes[0]);
} }
} }
})(document, "https://cdn.plyr.io/1.1.8/sprite.svg"); })(document, "https://cdn.plyr.io/1.1.9/sprite.svg");
</script> </script>
<!-- Plyr core script --> <!-- Plyr core script -->
<script src="https://cdn.plyr.io/1.1.8/plyr.js"></script> <script src="https://cdn.plyr.io/1.1.9/plyr.js"></script>
<!-- Docs script --> <!-- Docs script -->
<script src="https://cdn.plyr.io/1.1.8/docs.js"></script> <script src="https://cdn.plyr.io/1.1.9/docs.js"></script>
</body> </body>
</html> </html>

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "plyr", "name": "plyr",
"version": "1.1.8", "version": "1.1.9",
"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",

8
readme.md
View File

@ -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.8/plyr.js` to `https://cdn.plyr.io/1.1.8/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.9/plyr.js` to `https://cdn.plyr.io/1.1.9/plyr.js`
### Bower ### Bower
If bower is your thang, you can grab Plyr using: If bower is your thang, you can grab Plyr using:
@ -57,11 +57,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.1.8/plyr.css"> <link rel="stylesheet" href="https://cdn.plyr.io/1.1.9/plyr.css">
<script src="https://cdn.plyr.io/1.1.8/plyr.js"></script> <script src="https://cdn.plyr.io/1.1.9/plyr.js"></script>
``` ```
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.1.8/sprite.svg`. You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.1.9/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.

14
src/js/plyr.js
View File

@ -1,6 +1,6 @@
// ========================================================================== // ==========================================================================
// Plyr // Plyr
// plyr.js v1.1.8 // plyr.js v1.1.9
// https://github.com/selz/plyr // https://github.com/selz/plyr
// License: The MIT License (MIT) // License: The MIT License (MIT)
// ========================================================================== // ==========================================================================
@ -1167,6 +1167,11 @@
// Set the player volume // Set the player volume
player.media.volume = parseFloat(volume / 10); player.media.volume = parseFloat(volume / 10);
// Toggle muted state
if(player.media.muted && volume > 0) {
_toggleMute();
}
} }
// Mute // Mute
@ -1189,10 +1194,6 @@
if(player.supported.full && player.volume) { if(player.supported.full && player.volume) {
player.volume.value = volume; player.volume.value = volume;
} }
// Update mute button state
if(player.supported.full && player.buttons.mute) {
player.buttons.mute.checked = player.media.muted;
}
// Store the volume in storage // Store the volume in storage
if(config.storage.enabled && _storage().supported) { if(config.storage.enabled && _storage().supported) {
@ -1200,7 +1201,8 @@
} }
// Toggle class if muted // Toggle class if muted
_toggleClass(player.container, config.classes.muted, volume === 0); _toggleClass(player.container, config.classes.muted, (volume === 0));
player.buttons.mute.checked = (volume === 0);
} }
// Toggle captions // Toggle captions