Decreased sensitivity and inverted scroll on volume slider (scroll up to increase, down to decrease)

This commit is contained in:
Sam Potts 2016-05-19 12:06:51 +10:00
parent 1496b21c83
commit 98e4c5acea
5 changed files with 19 additions and 13 deletions

View File

@ -1,5 +1,8 @@
# Changelog
## v1.6.13
- Decreased sensitivity and inverted scroll on volume slider (scroll up to increase, down to decrease)
## v1.6.12
- Fix for undefined buffer error
- Add scroll listener on volume slider (PR #227 bty @igoradamenko)

2
dist/plyr.js vendored

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"name": "plyr",
"version": "1.6.12",
"version": "1.6.13",
"description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
"homepage": "http://plyr.io",
"main": "src/js/plyr.js",

View File

@ -40,7 +40,7 @@ If you have any cool ideas or features, please let me know by [creating an issue
## Implementation
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.6.12/plyr.js` to `https://cdn.plyr.io/1.6.12/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.6.13/plyr.js` to `https://cdn.plyr.io/1.6.13/plyr.js`
### npm
@ -71,11 +71,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.6.12/plyr.css">
<script src="https://cdn.plyr.io/1.6.12/plyr.js"></script>
<link rel="stylesheet" href="https://cdn.plyr.io/1.6.13/plyr.css">
<script src="https://cdn.plyr.io/1.6.13/plyr.js"></script>
```
The SVG sprite/defs file can be found here: `https://cdn.plyr.io/1.6.12/plyr.svg`.
The SVG sprite/defs file can be found here: `https://cdn.plyr.io/1.6.13/plyr.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.scss` file included in `/src` in your build to save a request.
@ -113,7 +113,7 @@ Using AJAX means you can load the sprite from a different origin. Avoiding the i
c.innerHTML = a.responseText;
b.insertBefore(c, b.childNodes[0]);
};
})(document, 'https://cdn.plyr.io/1.6.12/plyr.svg');
})(document, 'https://cdn.plyr.io/1.6.13/plyr.svg');
</script>
```
@ -188,7 +188,7 @@ Be sure to [validate your caption files](https://quuz.org/webvtt/)
Here's an example of a default setup:
```html
<script src="https://cdn.plyr.io/1.6.12/plyr.js"></script>
<script src="https://cdn.plyr.io/1.6.13/plyr.js"></script>
<script>plyr.setup();</script>
```

View File

@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
// plyr.js v1.6.12
// plyr.js v1.6.13
// https://github.com/selz/plyr
// License: The MIT License (MIT)
// ==========================================================================
@ -2107,14 +2107,14 @@
function _increaseVolume() {
var volume = plyr.media.muted ? 0 : (plyr.media.volume * config.volumeMax);
_setVolume(volume + config.volumeStep);
_setVolume(volume + (config.volumeStep / 5));
}
// Decrease volume
function _decreaseVolume() {
var volume = plyr.media.muted ? 0 : (plyr.media.volume * config.volumeMax);
_setVolume(volume - config.volumeStep);
_setVolume(volume - (config.volumeStep / 5));
}
// Update volume UI and storage
@ -2786,15 +2786,18 @@
_on(plyr.controls, 'focus blur', _toggleControls, true);
}
// Adjust volume on scroll
_on(plyr.volume.input, 'wheel', function(event) {
event.preventDefault();
// Scroll down to decrease
if (event.deltaY < 0 || event.deltaX > 0) {
_increaseVolume();
_decreaseVolume();
}
// Scroll up to increase
if (event.deltaY > 0 || event.deltaX < 0) {
_decreaseVolume();
_increaseVolume();
}
});
}