update: fullscreen scrollable

festoney8 · Jul 9, 2024 · 75d2997 · 75d2997
1 parent dc2c4ca
commit 75d2997
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/src/filters/dynFilter/filters/core.ts b/src/filters/dynFilter/filters/core.ts
@@ -92,10 +92,9 @@ class CoreDynFilter {
                                     // 命中黑名单，未命中白名单
                                     // debug(_result)
                                     if (!isEleHide(dyn)) {
-                                        log(`hide dyn
-                                            dynUploader: ${info.dynUploader}
-                                            dynDuration: ${info.dynDuration}
-                                            dynTitle: ${info.dynTitle}`)
+                                        log(
+                                            `hide dyn\ndynUploader: ${info.dynUploader}\ndynDuration: ${info.dynDuration}\ndynTitle: ${info.dynTitle}`,
+                                        )
                                     }
                                     hideEle(dyn)
                                 })
@@ -106,10 +105,9 @@ class CoreDynFilter {
                                 })
                         } else {
                             if (!isEleHide(dyn)) {
-                                log(`hide dyn
-                                    dynUploader: ${info.dynUploader}
-                                    dynDuration: ${info.dynDuration}
-                                    dynTitle: ${info.dynTitle}`)
+                                log(
+                                    `hide dyn\ndynUploader: ${info.dynUploader}\ndynDuration: ${info.dynDuration}\ndynTitle: ${info.dynTitle}`,
+                                )
                             }
                             hideEle(dyn)
                         }

diff --git a/src/rules/bangumi.ts b/src/rules/bangumi.ts
@@ -200,15 +200,11 @@ if (isPageBangumi()) {
                                     break
                                 case 'f11':
                                     // f11全屏模式
-                                    if (isWebScreen()) {
-                                        webBtn.click()
-                                    } else {
-                                        webBtn.click()
-                                    }
+                                    webBtn.click()
                                     break
                                 case 'not':
                                     // 申请可滚动全屏
-                                    document.body.requestFullscreen().then().catch()
+                                    document.documentElement.requestFullscreen().then().catch()
                                     if (!isWebScreen()) {
                                         webBtn.click()
                                     }
@@ -219,9 +215,9 @@ if (isPageBangumi()) {
                         fullBtn.parentElement?.replaceChild(newFullBtn, fullBtn)
                     } else {
                         cnt++
-                        cnt > 100 && clearInterval(id)
+                        cnt > 50 && clearInterval(id)
                     }
-                }, 100)
+                }, 200)
             },
             enableFuncRunAt: 'document-end',
             disableFunc: async () => document.removeEventListener('wheel', disableAdjustVolume),

diff --git a/src/rules/video.ts b/src/rules/video.ts
@@ -397,15 +397,11 @@ if (isPageVideo() || isPagePlaylist()) {
                                     break
                                 case 'f11':
                                     // f11全屏模式
-                                    if (isWebScreen()) {
-                                        webBtn.click()
-                                    } else {
-                                        webBtn.click()
-                                    }
+                                    webBtn.click()
                                     break
                                 case 'not':
                                     // 申请可滚动全屏
-                                    document.body.requestFullscreen().then().catch()
+                                    document.documentElement.requestFullscreen().then().catch()
                                     if (!isWebScreen()) {
                                         webBtn.click()
                                     }
@@ -416,9 +412,9 @@ if (isPageVideo() || isPagePlaylist()) {
                         fullBtn.parentElement?.replaceChild(newFullBtn, fullBtn)
                     } else {
                         cnt++
-                        cnt > 100 && clearInterval(id)
+                        cnt > 50 && clearInterval(id)
                     }
-                }, 100)
+                }, 200)
             },
             enableFuncRunAt: 'document-end',
             disableFunc: async () => document.removeEventListener('wheel', disableAdjustVolume),