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

Minor bug fixes

Browse Source
This commit is contained in:
Sam Potts 2015-04-06 19:42:26 +10:00
parent 99cabd545d
commit 3526e322ef
10 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.md
View File

@ -1,5 +1,8 @@
# Changelog # Changelog
## v1.1.4
- Minor bug fixes
## v1.1.3 ## v1.1.3
- Fixes for random id used in controls with multiple instances and one call to setup - Fixes for random id used in controls with multiple instances and one call to setup
- Audio player UI improvements - Audio player UI improvements

2
dist/plyr.css vendored
View File

File diff suppressed because one or more lines are too long

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

2
package.json
View File

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

@ -38,7 +38,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.3/plyr.js` to `https://cdn.plyr.io/1.1.3/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.4/plyr.js` to `https://cdn.plyr.io/1.1.4/plyr.js`
### Bower ### Bower
If bower is your thang, you can grab Plyr using: If bower is your thang, you can grab Plyr using:
@ -58,11 +58,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. HTTPS (SSL) is supported. If you want to use our CDN, you can use the following. HTTPS (SSL) is supported.
```html ```html
<link rel="stylesheet" href="//cdn.plyr.io/1.1.3/plyr.css"> <link rel="stylesheet" href="//cdn.plyr.io/1.1.4/plyr.css">
<script src="//cdn.plyr.io/1.1.3/plyr.js"></script> <script src="//cdn.plyr.io/1.1.4/plyr.js"></script>
``` ```
You can also access the `sprite.svg` file at `//cdn.plyr.io/1.1.3/sprite.svg`. You can also access the `sprite.svg` file at `//cdn.plyr.io/1.1.4/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.

13
src/js/plyr.js
View File

@ -1111,6 +1111,11 @@
// 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
if (player.isFullscreen) {
_toggleClass(player.controls, config.classes.hover, false);
}
} }
// Bail from faux-fullscreen // Bail from faux-fullscreen
@ -1485,14 +1490,14 @@
if(player.type === "video" && config.click) { if(player.type === "video" && config.click) {
_on(player.videoContainer, "click", function() { _on(player.videoContainer, "click", function() {
if(player.media.paused) { if(player.media.paused) {
_play(); _triggerEvent(player.buttons.play, "click");
} }
else if(player.media.ended) { else if(player.media.ended) {
_seek(); _seek();
_play(); _triggerEvent(player.buttons.play, "click");
} }
else { else {
_pause(); _triggerEvent(player.buttons.pause, "click");
} }
}); });
} }
@ -1501,7 +1506,7 @@
if(config.fullscreen.hideControls) { if(config.fullscreen.hideControls) {
_on(player.controls, "mouseenter mouseleave", function(event) { _on(player.controls, "mouseenter mouseleave", function(event) {
_toggleClass(player.controls, config.classes.hover, (event.type === "mouseenter")); _toggleClass(player.controls, config.classes.hover, (event.type === "mouseenter"));
}) });
} }
} }

2
src/less/plyr.less
View File

@ -9,7 +9,7 @@
@gray-dark: #343f4a; @gray-dark: #343f4a;
@gray: #565d64; @gray: #565d64;
@gray-light: #cbd0d3; @gray-light: #cbd0d3;
@off-white: #f9fafb; @off-white: #d6dadd;
// Font sizes // Font sizes
@font-size-small: 14px; @font-size-small: 14px;

2
src/sass/plyr.scss
View File

@ -9,7 +9,7 @@ $blue: #3498DB;
$gray-dark: #343f4a; $gray-dark: #343f4a;
$gray: #565d64; $gray: #565d64;
$gray-light: #cbd0d3; $gray-light: #cbd0d3;
$off-white: #f9fafb; $off-white: #d6dadd;
// Font sizes // Font sizes
$font-size-small: 14px; $font-size-small: 14px;