xobs/lca20-bt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge autoplay conflict #1771

Browse Source
This commit is contained in:
Hakim El Hattab
2017-02-14 14:51:14 +01:00
parent 909efab7df 962c6c133b
commit 313a23ba2b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/reveal.js
View File

@@ -3228,10 +3228,14 @@
}
// Autoplay is always on for slide backgrounds
var autoplay = el.hasAttribute( 'data-autoplay' ) || !!closestParent( el, '.slide-background' );
var autoplay = el.hasAttribute( 'data-autoplay' ) ||
el.hasAttribute( 'data-paused-by-reveal' ) ||
!!closestParent( el, '.slide-background' );
if( autoplay && typeof el.play === 'function' ) {
el.removeAttribute( 'data-paused-by-reveal' );
if( el.readyState > 1 ) {
startEmbeddedMedia( { target: el } );
}
@@ -3344,6 +3348,7 @@
// HTML5 media elements
toArray( element.querySelectorAll( 'video, audio' ) ).forEach( function( el ) {
if( !el.hasAttribute( 'data-ignore' ) && typeof el.pause === 'function' ) {
el.setAttribute('data-paused-by-reveal', '');
el.pause();
}
} );