File tree Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -1677,7 +1677,9 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
1677
1677
if ( this . isOpaque ( ) ) {
1678
1678
this . lastTouchEventTime_ = Date . now ( ) ;
1679
1679
// The controls are showing.
1680
- // Let this event continue and become a click.
1680
+ this . onContainerClick ( /* fromTouchEvent= */ true ) ;
1681
+ // Stop this event from becoming a click event.
1682
+ event . cancelable && event . preventDefault ( ) ;
1681
1683
} else {
1682
1684
// The controls are hidden, so show them.
1683
1685
this . onMouseMove_ ( event ) ;
@@ -1688,8 +1690,9 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
1688
1690
1689
1691
/**
1690
1692
* Manage the container click.
1693
+ * @param {boolean= } fromTouchEvent
1691
1694
*/
1692
- onContainerClick ( ) {
1695
+ onContainerClick ( fromTouchEvent = false ) {
1693
1696
if ( ! this . enabled_ || this . isPlayingVR ( ) ) {
1694
1697
return ;
1695
1698
}
@@ -1698,6 +1701,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
1698
1701
this . hideSettingsMenusTimer_ . tickNow ( ) ;
1699
1702
} else if ( this . config_ . singleClickForPlayAndPause ) {
1700
1703
this . playPausePresentation ( ) ;
1704
+ } else if ( fromTouchEvent && this . isOpaque ( ) ) {
1705
+ this . hideUI ( ) ;
1701
1706
}
1702
1707
}
1703
1708
Original file line number Diff line number Diff line change @@ -55,13 +55,14 @@ shaka.ui.HiddenSeekButton = class extends shaka.ui.Element {
55
55
this . hideSeekButtonContainerTimer_ = new shaka . util . Timer ( ( ) => {
56
56
const seekSeconds = parseInt ( this . seekValue_ . textContent , 10 ) ;
57
57
if ( seekSeconds === 0 ) {
58
- this . controls . onContainerClick ( ) ;
58
+ this . controls . onContainerClick ( /* fromTouchEvent= */ true ) ;
59
59
}
60
60
this . hideSeekButtonContainer_ ( ) ;
61
61
} ) ;
62
62
63
63
/** @protected {!HTMLElement} */
64
64
this . seekContainer = shaka . util . Dom . createHTMLElement ( 'div' ) ;
65
+ this . seekContainer . classList . add ( 'shaka-no-propagation' ) ;
65
66
this . parent . appendChild ( this . seekContainer ) ;
66
67
67
68
/** @private {!HTMLElement} */
Original file line number Diff line number Diff line change @@ -333,7 +333,7 @@ shaka.ui.Overlay = class {
333
333
fullScreenElement : this . videoContainer_ ,
334
334
preferDocumentPictureInPicture : true ,
335
335
showAudioChannelCountVariants : true ,
336
- seekOnTaps : navigator . maxTouchPoints > 0 ,
336
+ seekOnTaps : false ,
337
337
tapSeekDistance : 10 ,
338
338
refreshTickInSeconds : 0.125 ,
339
339
displayInVrMode : false ,
@@ -356,6 +356,8 @@ shaka.ui.Overlay = class {
356
356
// This is in line with default styles in Chrome.
357
357
if ( this . isMobile ( ) ) {
358
358
config . addBigPlayButton = true ;
359
+ config . singleClickForPlayAndPause = false ;
360
+ config . seekOnTaps = true ;
359
361
config . controlPanelElements = config . controlPanelElements . filter (
360
362
( name ) => name != 'play_pause' && name != 'volume' ) ;
361
363
}
You can’t perform that action at this time.
0 commit comments