Compare commits

...

9 Commits

Author SHA1 Message Date
Sam Potts a8cea7b5c9 1.5.10 2016-01-26 22:44:09 +11:00
Sam Potts 01bdcc2b01 Merge pull request #151 from marvinhagemeister/fix_npm
Fix broken npm require/import
2016-01-26 20:44:44 +11:00
Marvin Hagemeister 812d2d33f2 NPM package main must always be the main source file. Fixes broken require/import 2016-01-26 10:21:03 +01:00
Sam Potts a59073c5ca Update readme.md 2016-01-26 10:16:02 +11:00
Sam Potts 7edc3ccd53 NPM updates and published (fixes #146) 2016-01-26 10:08:19 +11:00
Sam Potts b217e23880 Npm changes 2016-01-26 09:59:17 +11:00
Sam Potts 053b6c2e3f Merge pull request #150 from marvinhagemeister/remove_global
Remove global preinstall script
2016-01-26 09:33:49 +11:00
Marvin Hagemeister 0d426ca479 Remove global preinstall script. Gulp does not have to be globally installed to build plyr 2016-01-25 16:35:54 +01:00
Sam Potts a327056789 Seek fixes for touch 2016-01-25 11:25:32 +11:00
8 changed files with 76 additions and 23 deletions
+4
View File
@@ -1,5 +1,9 @@
# Changelog # Changelog
## v1.5.8
- Fix for touch device seek tooltip
- Seek improvements
## v1.5.7 ## v1.5.7
- Fix for control tooltips always showing - Fix for control tooltips always showing
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+14 -10
View File
@@ -1,9 +1,9 @@
{ {
"name": "plyr", "name": "plyr",
"version": "1.5.7", "version": "1.5.10",
"description": "A simple HTML5 media player using custom controls", "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
"homepage": "http://plyr.io", "homepage": "http://plyr.io",
"main": "gulpfile.js", "main": "src/js/plyr.js",
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"gulp": "^3.9.0", "gulp": "^3.9.0",
@@ -24,9 +24,6 @@
"gulp-util": "^3.0.7", "gulp-util": "^3.0.7",
"run-sequence": "^1.1.5" "run-sequence": "^1.1.5"
}, },
"scripts": {
"preinstall": "npm install -g gulp"
},
"keywords": [ "keywords": [
"HTML5 Video", "HTML5 Video",
"HTML5 Audio", "HTML5 Audio",
@@ -36,8 +33,15 @@
"type": "git", "type": "git",
"url": "git://github.com/selz/plyr.git" "url": "git://github.com/selz/plyr.git"
}, },
"authors": [ "license": "MIT",
"Sam Potts <me@sampotts.me>" "bugs": {
], "url": "https://github.com/selz/plyr/issues"
"license": "MIT" },
"directories": {
"doc": "docs"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "Sam Potts <sam@selz.com> (selz.com)"
} }
+14 -5
View File
@@ -40,13 +40,22 @@ 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.5.7/plyr.js` to `https://cdn.plyr.io/1.5.7/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.9/plyr.js` to `https://cdn.plyr.io/1.5.9/plyr.js`
### Node Package Manager (NPM)
Using NPM, you can grab Plyr:
```
npm install plyr
```
[https://www.npmjs.com/package/plyr](https://www.npmjs.com/package/plyr)
### Bower ### Bower
If bower is your thang, you can grab Plyr using: If bower is your thang, you can grab Plyr using:
``` ```
bower install plyr bower install plyr
``` ```
[http://bower.io/search/?q=plyr](http://bower.io/search/?q=plyr)
More info on setting up dependencies can be found in the [Bower Docs](http://bower.io/docs/creating-packages/#maintaining-dependencies) More info on setting up dependencies can be found in the [Bower Docs](http://bower.io/docs/creating-packages/#maintaining-dependencies)
### Ember ### Ember
@@ -60,11 +69,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.5.7/plyr.css"> <link rel="stylesheet" href="https://cdn.plyr.io/1.5.9/plyr.css">
<script src="https://cdn.plyr.io/1.5.7/plyr.js"></script> <script src="https://cdn.plyr.io/1.5.9/plyr.js"></script>
``` ```
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.7/sprite.svg`. You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.9/sprite.svg`.
### CSS & Styling ### 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. 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.
@@ -161,7 +170,7 @@ More info on CORS here:
Here's an example of a default setup: Here's an example of a default setup:
```html ```html
<script src="https://cdn.plyr.io/1.5.7/plyr.js"></script> <script src="https://cdn.plyr.io/1.5.9/plyr.js"></script>
<script>plyr.setup();</script> <script>plyr.setup();</script>
``` ```
+4 -4
View File
@@ -2048,7 +2048,7 @@
// Update hover tooltip for seeking // Update hover tooltip for seeking
function _updateSeekTooltip(event) { function _updateSeekTooltip(event) {
// Bail if setting not true // Bail if setting not true
if (!config.tooltips.seek) { if (!config.tooltips.seek || plyr.browser.touch) {
return; return;
} }
@@ -2251,11 +2251,11 @@
// Load HTML5 sources // Load HTML5 sources
plyr.media.load(); plyr.media.load();
// Display duration if available
_displayDuration();
// Setup interface // Setup interface
_setupInterface(); _setupInterface();
// Display duration if available
_displayDuration();
} }
// Play if autoplay attribute is present // Play if autoplay attribute is present
+19 -1
View File
@@ -110,8 +110,11 @@
.seek-thumb() { .seek-thumb() {
background: transparent; background: transparent;
border: 0; border: 0;
width: (@plyr-control-spacing * 4); width: 1px;
height: @plyr-control-spacing; height: @plyr-control-spacing;
}
.seek-thumb-touch() {
width: (@plyr-control-spacing * 4);
transform: translateX(-50%); transform: translateX(-50%);
} }
.seek-track() { .seek-track() {
@@ -495,6 +498,21 @@
} }
} }
// Touch seek wider handle
&--is-touch &--seek[type='range'] {
&::-webkit-slider-thumb {
.seek-thumb-touch();
}
// Mozilla
&::-moz-range-thumb {
.seek-thumb-touch();
}
// Microsoft
&::-ms-thumb {
.seek-thumb-touch();
}
}
// Loading state // Loading state
&--loading .plyr__progress--buffer { &--loading .plyr__progress--buffer {
animation: plyr-progress 1s linear infinite; animation: plyr-progress 1s linear infinite;
+19 -1
View File
@@ -111,8 +111,11 @@ $plyr-bp-captions-large: 768px !default; // When captions jump to the la
@mixin seek-thumb() { @mixin seek-thumb() {
background: transparent; background: transparent;
border: 0; border: 0;
width: ($plyr-control-spacing * 4); width: 1px;
height: $plyr-control-spacing; height: $plyr-control-spacing;
}
@mixin seek-thumb-touch() {
width: ($plyr-control-spacing * 4);
transform: translateX(-50%); transform: translateX(-50%);
} }
@mixin seek-track() { @mixin seek-track() {
@@ -496,6 +499,21 @@ $plyr-bp-captions-large: 768px !default; // When captions jump to the la
} }
} }
// Touch seek wider handle
&--is-touch &--seek[type='range'] {
&::-webkit-slider-thumb {
@include seek-thumb-touch();
}
// Mozilla
&::-moz-range-thumb {
@include seek-thumb-touch();
}
// Microsoft
&::-ms-thumb {
@include seek-thumb-touch();
}
}
// Loading state // Loading state
&--loading .plyr__progress--buffer { &--loading .plyr__progress--buffer {
animation: plyr-progress 1s linear infinite; animation: plyr-progress 1s linear infinite;