Skip to content

Commit

Permalink
Fix for control tooltips always showing
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Potts committed Jan 25, 2016
1 parent 3127cea commit b006b73
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 12 deletions.
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## v1.5.7
- Fix for control tooltips always showing

## v1.5.6
- Seek tooltip (option for tooltips changed, please check docs)
- SASS compile error fixes (fixes #148)
Expand Down
2 changes: 1 addition & 1 deletion controls.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ This is an example `html` option with all controls.
var controls = ["<div class='plyr__controls'>",
"<div class='plyr__progress'>",
"<label for='seek{id}' class='plyr__sr-only'>Seek</label>",
"<input id='seek{id}' class='plyr__progress--seek' type='range' min='0' max='100' step='0.5' value='0' data-plyr='seek'>",
"<input id='seek{id}' class='plyr__progress--seek' type='range' min='0' max='100' step='0.1' value='0' data-plyr='seek'>",
"<progress class='plyr__progress--played' max='100' value='0'>",
"<span>0</span>% played",
"</progress>",
Expand Down
2 changes: 1 addition & 1 deletion dist/plyr.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/plyr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "plyr",
"version": "1.5.6",
"version": "1.5.7",
"description": "A simple HTML5 media player using custom controls",
"homepage": "http://plyr.io",
"main": "gulpfile.js",
Expand Down
10 changes: 5 additions & 5 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

**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.5.6/plyr.js` to `https://cdn.plyr.io/1.5.6/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.5.7/plyr.js` to `https://cdn.plyr.io/1.5.7/plyr.js`

### Bower
If bower is your thang, you can grab Plyr using:
Expand All @@ -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:

```html
<link rel="stylesheet" href="https://cdn.plyr.io/1.5.6/plyr.css">
<script src="https://cdn.plyr.io/1.5.6/plyr.js"></script>
<link rel="stylesheet" href="https://cdn.plyr.io/1.5.7/plyr.css">
<script src="https://cdn.plyr.io/1.5.7/plyr.js"></script>
```

You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.6/sprite.svg`.
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.7/sprite.svg`.

### CSS & Styling
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.
Expand Down Expand Up @@ -161,7 +161,7 @@ More info on CORS here:
Here's an example of a default setup:

```html
<script src="https://cdn.plyr.io/1.5.6/plyr.js"></script>
<script src="https://cdn.plyr.io/1.5.7/plyr.js"></script>
<script>plyr.setup();</script>
```

Expand Down
4 changes: 2 additions & 2 deletions src/js/plyr.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
'<div class="plyr__controls">',
'<div class="plyr__progress">',
'<label for="seek{id}" class="plyr__sr-only">Seek</label>',
'<input id="seek{id}" class="plyr__progress--seek" type="range" min="0" max="100" step="0.5" value="0" data-plyr="seek">',
'<input id="seek{id}" class="plyr__progress--seek" type="range" min="0" max="100" step="0.1" value="0" data-plyr="seek">',
'<progress class="plyr__progress--played" max="100" value="0">',
'<span>0</span>% ' + config.i18n.played,
'</progress>',
Expand Down Expand Up @@ -943,7 +943,7 @@
container.insertAdjacentHTML('beforeend', html);

// Setup tooltips
if (config.tooltips) {
if (config.tooltips.controls) {
var labels = _getElements(config.selectors.labels + ' .' + config.classes.hidden);

for (var i = labels.length - 1; i >= 0; i--) {
Expand Down
2 changes: 1 addition & 1 deletion src/less/plyr.less
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

// Tooltips
@plyr-tooltip-bg: @plyr-controls-bg;
@plyr-tooltip-border-color: fade(@plyr-gray-dark, 10%);
@plyr-tooltip-border-color: fade(darken(@plyr-controls-bg, 5%), 10%);
@plyr-tooltip-border-width: 1px;
@plyr-tooltip-shadow: 0 0 5px @plyr-tooltip-border-color, 0 0 0 @plyr-tooltip-border-width @plyr-tooltip-border-color;
@plyr-tooltip-color: @plyr-control-color;
Expand Down

0 comments on commit b006b73

Please sign in to comment.