diff options
| author | Sam Potts <me@sampotts.me> | 2016-08-26 18:15:24 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2016-08-26 18:15:24 +1000 |
| commit | 1ced6b4d67aad375b212a221dd85fbb86acf60f7 (patch) | |
| tree | 1f715c406b4c3ca0c3d9f6aba61a3091913db150 /src/js | |
| parent | 6694c1e6cfc3be6fb03089954a5fcafbfbbb02bf (diff) | |
| download | plyr-1ced6b4d67aad375b212a221dd85fbb86acf60f7.tar.lz plyr-1ced6b4d67aad375b212a221dd85fbb86acf60f7.tar.xz plyr-1ced6b4d67aad375b212a221dd85fbb86acf60f7.zip | |
Vimeo IE9/10 (Fixes #348), HTML5 ready event (Fixes #349)
Diffstat (limited to 'src/js')
| -rw-r--r-- | src/js/plyr.js | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index 6e8f766f..ef5c1183 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v2.0.4 +// plyr.js v2.0.5 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== @@ -43,7 +43,7 @@ displayDuration: true, loadSprite: true, iconPrefix: 'plyr', - iconUrl: 'https://cdn.plyr.io/2.0.4/plyr.svg', + iconUrl: 'https://cdn.plyr.io/2.0.5/plyr.svg', clickToPlay: true, hideControls: true, showPosterOnEnd: false, @@ -175,7 +175,7 @@ fullscreen: null }, // Events to watch on HTML5 media elements - events: ['ended', 'progress', 'stalled', 'playing', 'waiting', 'canplay', 'canplaythrough', 'loadstart', 'loadeddata', 'loadedmetadata', 'timeupdate', 'volumechange', 'play', 'pause', 'error', 'seeking', 'emptied'], + events: ['ready', 'ended', 'progress', 'stalled', 'playing', 'waiting', 'canplay', 'canplaythrough', 'loadstart', 'loadeddata', 'loadedmetadata', 'timeupdate', 'volumechange', 'play', 'pause', 'error', 'seeking', 'emptied'], // Logging logPrefix: '[Plyr]' }; @@ -1785,8 +1785,8 @@ function _vimeoReady(mediaId, container) { // Setup instance // https://github.com/vimeo/player.js - plyr.embed = new window.Vimeo.Player(container.id, { - id: mediaId, + plyr.embed = new window.Vimeo.Player(container, { + id: parseInt(mediaId), loop: config.loop, autoplay: config.autoplay, byline: false, @@ -3473,8 +3473,10 @@ // Everything done function _ready() { - // Ready event - _triggerEvent(plyr.container, 'ready', true); + // Ready event at end of execution stack + window.setTimeout(function() { + _triggerEvent(plyr.media, 'ready'); + }, 0); // Set class hook on media element _toggleClass(plyr.media, defaults.classes.setup, true); @@ -3681,7 +3683,7 @@ // Listen for events if debugging if (config.debug) { - var events = config.events.concat(['setup', 'ready', 'statechange', 'enterfullscreen', 'exitfullscreen', 'captionsenabled', 'captionsdisabled']); + var events = config.events.concat(['setup', 'statechange', 'enterfullscreen', 'exitfullscreen', 'captionsenabled', 'captionsdisabled']); _on(instance.getContainer(), events.join(' '), function(event) { console.log([config.logPrefix, 'event:', event.type].join(' '), event.detail.plyr); |