ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
#	docs/dist/docs.css
#	docs/src/less/components/examples.less
#	src/js/plyr.js
This commit is contained in:
Sam Potts
2015-08-27 07:36:17 +10:00
parent 0785ca6024 6543fc1e5b
commit 95e39e7bd7
32 changed files with 675 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/plyr.js
View File

@ -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 || {}));
}(this.plyr = this.plyr || {}));