Skip to content

Commit

Permalink
v1.5.12
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Potts committed Feb 21, 2016
1 parent d538cdc commit 5b968c9
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 7 deletions.
20 changes: 20 additions & 0 deletions npm-debug.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
0 info it worked if it ends with ok
1 verbose cli [ '/usr/local/Cellar/node/5.0.0/bin/node',
1 verbose cli '/usr/local/bin/npm',
1 verbose cli 'version',
1 verbose cli '1.5.12' ]
2 info using [email protected]
3 info using [email protected]
4 verbose stack Error: Version not changed
4 verbose stack at /usr/local/lib/node_modules/npm/lib/version.js:52:49
4 verbose stack at /usr/local/lib/node_modules/npm/node_modules/graceful-fs/graceful-fs.js:76:16
4 verbose stack at FSReqWrap.readFileAfterClose [as oncomplete] (fs.js:404:3)
5 verbose cwd /usr/local/var/www/dev/plyr
6 error Darwin 14.5.0
7 error argv "/usr/local/Cellar/node/5.0.0/bin/node" "/usr/local/bin/npm" "version" "1.5.12"
8 error node v5.0.0
9 error npm v3.3.9
10 error Version not changed
11 error If you need help, you may report this error at:
11 error <https://github.com/npm/npm/issues>
12 verbose exit [ 1, true ]
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.11/plyr.js` to `https://cdn.plyr.io/1.5.11/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.12/plyr.js` to `https://cdn.plyr.io/1.5.12/plyr.js`

### Node Package Manager (NPM)
Using NPM, you can grab Plyr:
Expand Down Expand Up @@ -69,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:

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

You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.11/sprite.svg`.
You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.12/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 @@ -170,7 +170,7 @@ More info on CORS here:
Here's an example of a default setup:

```html
<script src="https://cdn.plyr.io/1.5.11/plyr.js"></script>
<script src="https://cdn.plyr.io/1.5.12/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 @@ -1043,7 +1043,7 @@
_setCaption(plyr.currentCaption);
}
else {
_setCaption('');
_setCaption();
}
}

Expand Down Expand Up @@ -2460,7 +2460,7 @@
_on(plyr.media, 'ended', function() {
// Clear
if (plyr.type === 'video') {
_setCaption('');
_setCaption();
}

// Reset UI
Expand Down

0 comments on commit 5b968c9

Please sign in to comment.