From 5b968c97f4a0a35fde5f3c338ec79274b32ebb9a Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 21 Feb 2016 14:07:17 +1100 Subject: [PATCH] v1.5.12 --- npm-debug.log | 20 ++++++++++++++++++++ readme.md | 10 +++++----- src/js/plyr.js | 4 ++-- 3 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 npm-debug.log diff --git a/npm-debug.log b/npm-debug.log new file mode 100644 index 000000000..cc4a1ab7b --- /dev/null +++ b/npm-debug.log @@ -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 npm@3.3.9 +3 info using node@v5.0.0 +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 +12 verbose exit [ 1, true ] diff --git a/readme.md b/readme.md index 7c6fef133..b5ef91e43 100644 --- a/readme.md +++ b/readme.md @@ -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: @@ -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 - - + + ``` -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. @@ -170,7 +170,7 @@ More info on CORS here: Here's an example of a default setup: ```html - + ``` diff --git a/src/js/plyr.js b/src/js/plyr.js index 81cd6f157..066392dd4 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1043,7 +1043,7 @@ _setCaption(plyr.currentCaption); } else { - _setCaption(''); + _setCaption(); } } @@ -2460,7 +2460,7 @@ _on(plyr.media, 'ended', function() { // Clear if (plyr.type === 'video') { - _setCaption(''); + _setCaption(); } // Reset UI