diff options
author | Sam Potts <me@sampotts.me> | 2015-08-27 07:36:17 +1000 |
---|---|---|
committer | Sam Potts <me@sampotts.me> | 2015-08-27 07:36:17 +1000 |
commit | 95e39e7bd724a27d07086f10c5333ed51073121d (patch) | |
tree | b2a8f1d7512a484548a520bf2898a7a772ab77ec /src/js/plyr.js | |
parent | 0785ca602400d92d6fe596cc7202d57d3b04d220 (diff) | |
parent | 6543fc1e5bb8445f816b8206f6b36521dead6364 (diff) | |
download | plyr-95e39e7bd724a27d07086f10c5333ed51073121d.tar.lz plyr-95e39e7bd724a27d07086f10c5333ed51073121d.tar.xz plyr-95e39e7bd724a27d07086f10c5333ed51073121d.zip |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# dist/plyr.js
# docs/dist/docs.css
# docs/src/less/components/examples.less
# src/js/plyr.js
Diffstat (limited to 'src/js/plyr.js')
-rw-r--r-- | src/js/plyr.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index b14f6964..dfcc12f0 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v1.3.4 +// plyr.js v1.3.5 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== @@ -1398,6 +1398,7 @@ player.embed.api('seekTo', targetTime); } + // Trigger timeupdate _triggerEvent(player.media, 'timeupdate'); if (paused) { @@ -2047,6 +2048,10 @@ if (player.type == 'video' || player.type == 'audio') { // Bail if no support if (!player.supported.full) { + // Successful setup + player.init = true; + + // Don't inject controls if no full support return; } @@ -2197,4 +2202,4 @@ return players; }; -}(this.plyr = this.plyr || {}));
\ No newline at end of file +}(this.plyr = this.plyr || {})); |