diff options
| author | Sam Potts <me@sampotts.me> | 2016-11-27 20:15:19 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2016-11-27 20:15:19 +1100 |
| commit | 28cd92b708394bf9a3b829faf7ba35d58dec9f5f (patch) | |
| tree | 24583560278566b428ff9eadfb9845070d9670c7 | |
| parent | a44c7ecc3a077b11fc586bba8aa2df25b01f209f (diff) | |
| parent | 5214c5d55d0644d8e0adb765137bd5b86696b3f9 (diff) | |
| download | plyr-28cd92b708394bf9a3b829faf7ba35d58dec9f5f.tar.lz plyr-28cd92b708394bf9a3b829faf7ba35d58dec9f5f.tar.xz plyr-28cd92b708394bf9a3b829faf7ba35d58dec9f5f.zip | |
Merge branch 'master' of https://github.com/Selz/plyr
| -rw-r--r-- | readme.md | 8 | ||||
| -rw-r--r-- | src/js/plyr.js | 4 |
2 files changed, 8 insertions, 4 deletions
@@ -132,7 +132,7 @@ Include the `plyr.js` script before the closing `</body>` tag and then call `ply <script>plyr.setup();</script> ``` -If you want to use our CDN for the JavaScript, you can use the following: +If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the JavaScript, you can use the following: ```html <script src="https://cdn.plyr.io/2.0.10/plyr.js"></script> @@ -145,14 +145,14 @@ Include the `plyr.css` stylsheet into your `<head>` <link rel="stylesheet" href="path/to/plyr.css"> ``` -If you want to use our CDN for the default CSS, you can use the following: +If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the default CSS, you can use the following: ```html <link rel="stylesheet" href="https://cdn.plyr.io/2.0.10/plyr.css"> ``` ### SVG Sprite -The SVG sprite is loaded automatically from our CDN. To change this, see the [options](#Options) below. For reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/2.0.10/plyr.svg`. +The SVG sprite is loaded automatically from our CDN (provided by [Fastly](https://www.fastly.com/)). To change this, see the [options](#Options) below. For reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/2.0.10/plyr.svg`. ## Advanced @@ -1067,5 +1067,7 @@ Also these links helped created Plyr: - [Media Events - W3.org](http://www.w3.org/2010/05/video/mediaevents.html) - [Styling the `<progress>` element - hongkiat.com](http://www.hongkiat.com/blog/html5-progress-bar/) +Thanks to [Fastly](https://www.fastly.com/) for providing the CDN services. + ## Copyright and License [The MIT license](license.md). diff --git a/src/js/plyr.js b/src/js/plyr.js index d65c4f7a..8a486d93 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -3258,7 +3258,7 @@ plyr.embed.unload().then(cleanUp); // Vimeo does not always return - window.setTimeout(cleanUp, 200); + timers.cleanUp = window.setTimeout(cleanUp, 200); break; @@ -3274,6 +3274,8 @@ } function cleanUp() { + clearTimeout(timers.cleanUp); + // Default to restore original element if (!_is.boolean(restore)) { restore = true; |