diff options
| author | Sam Potts <me@sampotts.me> | 2016-10-23 15:27:28 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2016-10-23 15:27:28 +1100 |
| commit | 5cecf16d4f9edecdbf656e2618b8748ebff677d8 (patch) | |
| tree | 1a06c99fbb1ea61b23a3e061e526c4154150eaae /src/js | |
| parent | 21a30f1b6fd3f95550ea37fc610b94ea9e688899 (diff) | |
| parent | a3ed3093429d5306a89566215207d42a476392d8 (diff) | |
| download | plyr-5cecf16d4f9edecdbf656e2618b8748ebff677d8.tar.lz plyr-5cecf16d4f9edecdbf656e2618b8748ebff677d8.tar.xz plyr-5cecf16d4f9edecdbf656e2618b8748ebff677d8.zip | |
Merge branch 'master' into develop
# Conflicts:
# demo/dist/demo.js
# dist/plyr.css
# dist/plyr.js
Diffstat (limited to 'src/js')
| -rw-r--r-- | src/js/plyr.js | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index f42e7641..7eb72067 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v2.0.7 +// plyr.js v2.0.9 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== @@ -45,7 +45,7 @@ displayDuration: true, loadSprite: true, iconPrefix: 'plyr', - iconUrl: 'https://cdn.plyr.io/2.0.7/plyr.svg', + iconUrl: 'https://cdn.plyr.io/2.0.9/plyr.svg', clickToPlay: true, hideControls: true, showPosterOnEnd: false, @@ -1872,6 +1872,14 @@ _triggerEvent(plyr.media, 'timeupdate'); }, 100); + // Check duration again due to YouTube bug + // https://github.com/Selz/plyr/issues/374 + // https://code.google.com/p/gdata-issues/issues/detail?id=8690 + if (plyr.media.duration !== instance.getDuration()) { + plyr.media.duration = instance.getDuration(); + _triggerEvent(plyr.media, 'durationchange'); + } + break; case 2: @@ -3650,7 +3658,8 @@ isMuted: function() { return plyr.media.muted; }, isReady: function() { return _hasClass(plyr.container, config.classes.ready); }, isLoading: function() { return _hasClass(plyr.container, config.classes.loading); }, - on: function(event, callback) { _on(plyr.container, event, callback); }, + isPaused: function() { return plyr.media.paused; }, + on: function(event, callback) { _on(plyr.container, event, callback); return this; }, play: _play, pause: _pause, stop: function() { _pause(); _seek(); }, |