flan/advanced-camera-card
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #719 from dermotduffy/message-actions

Browse Source 
Don't support card-wide actions when a message is displayed
This commit is contained in:
Dermot Duffy
2022-06-25 09:35:09 -07:00
committed by GitHub
parent b5fb308067 98b3eaadb5
commit 9905dde925
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -1
View File
@@ -932,7 +932,8 @@ next/previous controls, thumbnails, etc), but in some cases this is not possible
(e.g. embedded WebRTC card controls) -- in these cases duplicate actions may (e.g. embedded WebRTC card controls) -- in these cases duplicate actions may
occur with certain configurations (e.g. `tap`). occur with certain configurations (e.g. `tap`).
**Note:** Card-wide actions are not supported on the timeline view. **Note:** Card-wide actions are not supported on the timeline view, nor when a
info/error message is being displayed.
## Menu Styles ## Menu Styles
src/card.ts
+1 -1
View File
@@ -1695,7 +1695,7 @@ export class FrigateCard extends LitElement {
* @returns A combined set of action. * @returns A combined set of action.
*/ */
protected _getMergedActions(): Actions { protected _getMergedActions(): Actions {
if (this._view?.is('timeline')) { if (this._message || this._view?.is('timeline')) {
// Timeline does not support actions as it is not possible to prevent // Timeline does not support actions as it is not possible to prevent
// touch actions on the timeline surface from triggering card-wide actions // touch actions on the timeline surface from triggering card-wide actions
// inappropriately, whilst also maintaining touch interaction with the // inappropriately, whilst also maintaining touch interaction with the