Skip to content

Commit

Permalink
fix:增加composedPath的兼容
Browse files Browse the repository at this point in the history
  • Loading branch information
xxxily committed Apr 23, 2023
1 parent b1c5075 commit 43499e2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions dist/h5player.js
Original file line number Diff line number Diff line change
Expand Up @@ -3958,7 +3958,8 @@ const crossTabCtl = {
crossTabKeydownEvent (event) {
const t = crossTabCtl;
/* 处于可编辑元素中不执行任何快捷键 */
if (isEditableTarget(event.target)) return
const target = event.composedPath ? event.composedPath()[0] || event.target : event.target;
if (isEditableTarget(target)) return
if (t.isNeedSendCrossTabCtlEvent() && isRegisterKey(event) && !t.excludeShortcuts(event)) {
// 阻止事件冒泡和默认事件
event.stopPropagation();
Expand Down Expand Up @@ -7429,7 +7430,8 @@ const h5Player = {
const player = t.player();

/* 处于可编辑元素中不执行任何快捷键 */
if (isEditableTarget(event.target)) return
const target = event.composedPath ? event.composedPath()[0] || event.target : event.target;
if (isEditableTarget(target)) return

/* 广播按键消息,进行跨域控制 */
monkeyMsg.send('globalKeydownEvent', event, 0);
Expand Down
3 changes: 2 additions & 1 deletion src/h5player/crossTabCtl.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ const crossTabCtl = {
crossTabKeydownEvent (event) {
const t = crossTabCtl
/* 处于可编辑元素中不执行任何快捷键 */
if (isEditableTarget(event.composedPath()[0] || event.target)) return
const target = event.composedPath ? event.composedPath()[0] || event.target : event.target
if (isEditableTarget(target)) return
if (t.isNeedSendCrossTabCtlEvent() && isRegisterKey(event) && !t.excludeShortcuts(event)) {
// 阻止事件冒泡和默认事件
event.stopPropagation()
Expand Down
3 changes: 2 additions & 1 deletion src/h5player/h5player.js
Original file line number Diff line number Diff line change
Expand Up @@ -2051,7 +2051,8 @@ const h5Player = {
const player = t.player()

/* 处于可编辑元素中不执行任何快捷键 */
if (isEditableTarget(event.composedPath()[0] || event.target)) return
const target = event.composedPath ? event.composedPath()[0] || event.target : event.target
if (isEditableTarget(target)) return

/* 广播按键消息,进行跨域控制 */
monkeyMsg.send('globalKeydownEvent', event, 0)
Expand Down

0 comments on commit 43499e2

Please sign in to comment.