-
-
Notifications
You must be signed in to change notification settings - Fork 18
BL-15721 show bubbles on top of videos #7597
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: Version6.3
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1640,21 +1640,34 @@ svg.bloom-videoControl { | |
| } | ||
| } | ||
|
|
||
| // Detector above the canvas so we can detect hover and clicks of playback controls | ||
| .bloom-videoMouseDetector { | ||
| height: 100%; | ||
| width: 100%; | ||
| position: absolute; | ||
| top: 0; | ||
| z-index: @canvasElementCanvasZIndex + 1; | ||
| } | ||
|
|
||
| // Show pause and replay when playing and hovered. | ||
| .bloom-videoContainer.playing:hover { | ||
| .bloom-videoControlContainer { | ||
| &.bloom-videoPauseIcon, | ||
| &.bloom-videoReplayIcon { | ||
| display: flex; | ||
| .bloom-videoContainer.playing { | ||
| .bloom-videoMouseDetector:hover { | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like we decided not to do hover behavior in BloomPlayer (e.g. BloomBooks/bloom-player@c31f0fc) but kept it in BloomDesktop. Do we still want this? |
||
| .bloom-videoControlContainer { | ||
| &.bloom-videoPauseIcon, | ||
| &.bloom-videoReplayIcon { | ||
| display: flex; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Show play, centered, when hovering a video that is not paused or playing | ||
| .bloom-videoContainer:not(.paused):not(.playing):hover { | ||
| .bloom-videoPlayIcon { | ||
| display: flex; | ||
| left: calc(50% - @videoIconSize / 2); | ||
| .bloom-videoContainer:not(.paused):not(.playing) { | ||
| .bloom-videoMouseDetector:hover { | ||
| .bloom-videoPlayIcon { | ||
| display: flex; | ||
| left: calc(50% - @videoIconSize / 2); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6426,7 +6426,8 @@ export class CanvasElementManager { | |
| .find(".bloom-ui") | ||
| .filter( | ||
| (_, x) => | ||
| !x.classList.contains("bloom-videoControlContainer"), | ||
| !x.classList.contains("bloom-videoControlContainer") && | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure what's going on here, we have a "Not sure about keeping this" comment above, but now there's no point in keeping a bloom-videoControlContainer without a bloom-videoMouseDetector, it won't work |
||
| !x.classList.contains("bloom-videoMouseDetector"), | ||
| ) | ||
| .remove(); | ||
| thisCanvasElement.find(".bloom-dragHandleTOP").remove(); // BL-7903 remove any left over drag handles (this was the class used in 4.7 alpha) | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know what to call this. "videoInteractionDetector"? "videoMouseEventDetector"? If we decide not to preserve hover detection (see below) then we could call it "videoClickDetector"