element-ready 现在默认 stopOnDomReady

不再需要额外封装一次了

src/content/modules/notification.js

@@ -1,7 +1,7 @@
 import { h } from 'dom-chef'
 import select from 'select-dom'
+import elementReady from 'element-ready'
 import sleep from 'p-sleep'
-import safeElementReady from '@libs/safeElementReady'
 import { fadeIn, fadeOut } from '@libs/fade'
 
 const FADE_DURATION = 500
@@ -39,8 +39,8 @@ async function animate(element) {
 
 export default {
   async ready() {
-    container = await safeElementReady('#container')
-    header = await safeElementReady('#header')
+    container = await elementReady('#container')
+    header = await elementReady('#header')
 
     return container && header
   },

src/content/modules/statusFormIntersectionObserver.js

@@ -1,5 +1,5 @@
+import elementReady from 'element-ready'
 import wrapper from '@libs/wrapper'
-import safeElementReady from '@libs/safeElementReady'
 import safelyInvokeFns from '@libs/safelyInvokeFns'
 import arrayUniquePush from '@libs/arrayUniquePush'
 import arrayRemove from '@libs/arrayRemove'
@@ -41,7 +41,7 @@ function intersectionObserverCallback([ { intersectionRatio } ]) {
 
 export default wrapper({
   async install() {
-    const update = await safeElementReady('#phupdate')
+    const update = await elementReady('#phupdate')
 
     if (update) {
       createSpy(update)

src/content/modules/timelineElementObserver.js

@@ -1,6 +1,6 @@
 import select from 'select-dom'
+import elementReady from 'element-ready'
 import wrapper from '@libs/wrapper'
-import safeElementReady from '@libs/safeElementReady'
 import safelyInvokeFns from '@libs/safelyInvokeFns'
 import arrayUniquePush from '@libs/arrayUniquePush'
 import arrayRemove from '@libs/arrayRemove'
@@ -64,7 +64,7 @@ function getStatuses() {
 
 export default wrapper({
   async install() {
-    stream = await safeElementReady('#stream')
+    stream = await elementReady('#stream')
 
     if (stream) {
       observer = new MutationObserver(streamMutationObserver)

src/features/batch-manage-relationships/script(page)[friend-requests].js

@@ -1,7 +1,7 @@
 import { h } from 'dom-chef'
 import select from 'select-dom'
+import elementReady from 'element-ready'
 import wretch from 'wretch'
-import safeElementReady from '@libs/safeElementReady'
 import { isFriendRequestPage } from '@libs/pageDetect'
 import untilElementRemoved from '@libs/untilElementRemoved'
 import neg from '@libs/neg'
@@ -131,7 +131,7 @@ export default context => {
   return {
     applyWhen: () => isFriendRequestPage(),
 
-    waitReady: () => safeElementReady('#footer'),
+    waitReady: () => elementReady('#footer'),
 
     onLoad() {
       createContainer()

src/features/batch-manage-relationships/script(page)[friends-and-followers].js

@@ -1,8 +1,8 @@
 import { h } from 'dom-chef'
 import select from 'select-dom'
+import elementReady from 'element-ready'
 import wretch from 'wretch'
 import { isLoggedInUserFriendsListPage, isLoggedInUserFollowersListPage, isFriendsListPage } from '@libs/pageDetect'
-import safeElementReady from '@libs/safeElementReady'
 import untilElementRemoved from '@libs/untilElementRemoved'
 import promiseAny from '@libs/promiseAny'
 
@@ -121,7 +121,7 @@ export default context => {
       isLoggedInUserFollowersListPage(),
     ]),
 
-    waitReady: () => safeElementReady('#footer'),
+    waitReady: () => elementReady('#footer'),
 
     onLoad() {
       createMasterCheckbox()

src/features/batch-remove-private-messages/script(page).js

@@ -1,8 +1,8 @@
 import { h } from 'dom-chef'
 import select from 'select-dom'
+import elementReady from 'element-ready'
 import wretch from 'wretch'
 import { isPrivateMessagePage } from '@libs/pageDetect'
-import safeElementReady from '@libs/safeElementReady'
 import untilElementRemoved from '@libs/untilElementRemoved'
 
 const CLASSNAME_CHECKBOX = 'sf-private-message-checkbox'
@@ -99,7 +99,7 @@ export default context => {
   return {
     applyWhen: () => isPrivateMessagePage(),
 
-    waitReady: () => safeElementReady('#footer'),
+    waitReady: () => elementReady('#footer'),
 
     onLoad() {
       createMasterCheckbox()

src/features/batch-remove-statuses/script(page).js

@@ -1,8 +1,8 @@
 import { h } from 'dom-chef'
 import select from 'select-dom'
+import elementReady from 'element-ready'
 import wretch from 'wretch'
 import { isLoggedInUserProfilePage } from '@libs/pageDetect'
-import safeElementReady from '@libs/safeElementReady'
 import collapseSelection from '@libs/collapseSelection'
 import noop from '@libs/noop'
 
@@ -258,7 +258,7 @@ export default context => {
   return {
     applyWhen: () => isLoggedInUserProfilePage(),
 
-    waitReady: () => safeElementReady('#footer'),
+    waitReady: () => elementReady('#footer'),
 
     onLoad() {
       createContainer()

src/features/better-at-autocomplete/script(page)[disable-old-one].js

@@ -1,14 +1,14 @@
+import elementReady from 'element-ready'
 import requireFanfouLib from '@libs/requireFanfouLib'
 import keepRetry from '@libs/keepRetry'
-import safeElementReady from '@libs/safeElementReady'
 
 export default () => {
   let $textarea
 
   return {
     async applyWhen() {
       const $ = await requireFanfouLib('jQuery')
-      const textarea = await safeElementReady('#phupdate textarea')
+      const textarea = await elementReady('#phupdate textarea')
 
       return textarea && ($textarea = $(textarea))
     },

src/features/go-top-button/script(page).js

@@ -1,7 +1,7 @@
 import select from 'select-dom'
+import elementReady from 'element-ready'
 import { h } from 'dom-chef'
 import debounce from 'just-debounce-it'
-import safeElementReady from '@libs/safeElementReady'
 import animatedScrollTop from '@libs/animatedScrollTop'
 import any from '@libs/promiseAny'
 
@@ -78,8 +78,8 @@ export default context => {
 
   return {
     applyWhen: () => any([
-      safeElementReady('#stream'),
-      safeElementReady('.inner-content'),
+      elementReady('#stream'),
+      elementReady('.inner-content'),
     ]),
 
     onLoad() {

src/features/process-unread-statuses/script(page)[process-unread-statuses].js

@@ -1,8 +1,8 @@
 import createActivityDetector from 'activity-detector'
 import select from 'select-dom'
+import elementReady from 'element-ready'
 import isVisible from 'is-visible'
 import getLoggedInUserProfilePageUrl from '@libs/getLoggedInUserProfilePageUrl'
-import safeElementReady from '@libs/safeElementReady'
 
 export default context => {
   const { readOptionValue, requireModules, elementCollection, registerDOMEventListener } = context
@@ -83,7 +83,7 @@ export default context => {
   return {
     applyWhen: () => elementCollection.ready('timelineNotification'),
 
-    waitReady: () => safeElementReady('#stream'),
+    waitReady: () => elementReady('#stream'),
 
     onLoad() {
       statusFormIntersectionObserver.addListener(intersectionObserverCallback)

src/features/remove-brackets/script(content).js

@@ -1,8 +1,8 @@
 import select from 'select-dom'
-import safeElementReady from '@libs/safeElementReady'
+import elementReady from 'element-ready'
 
 async function removeBrackets(selector) {
-  const found = await safeElementReady(selector)
+  const found = await elementReady(selector)
   if (!found) return
 
   for (const element of select.all(selector)) {

src/features/remove-personalized-theme/script(content).js

@@ -1,8 +1,8 @@
 import { h } from 'dom-chef'
+import elementReady from 'element-ready'
 import fanfouDefaultThemeCss from './fanfou-default-theme'
 import findUserThemeStyleElement from '@libs/findUserThemeStyleElement'
 import keepRetry from '@libs/keepRetry'
-import safeElementReady from '@libs/safeElementReady'
 import getLoggedInUserId from '@libs/getLoggedInUserId'
 import arrayUniquePush from '@libs/arrayUniquePush'
 import arrayRemove from '@libs/arrayRemove'
@@ -30,7 +30,7 @@ export default context => {
   }
 
   async function extractUserIdFromMeta() {
-    const meta = await safeElementReady('meta[name="author"]')
+    const meta = await elementReady('meta[name="author"]')
 
     if (meta) {
       const rawValue = meta.getAttribute('content')

src/features/update-timestamps/script(page).js

@@ -1,6 +1,6 @@
 import select from 'select-dom'
+import elementReady from 'element-ready'
 import requireFanfouLib from '@libs/requireFanfouLib'
-import safeElementReady from '@libs/safeElementReady'
 import every from '@libs/promiseEvery'
 
 const INTERVAL_DURATION = 15 * 1000
@@ -22,7 +22,7 @@ export default () => {
   }
 
   return {
-    applyWhen: () => safeElementReady('#stream'),
+    applyWhen: () => elementReady('#stream'),
 
     waitReady: () => every([
       requireFanfouLib('FF.util.parseDate'),

src/libs/ElementCollection.js

@@ -1,5 +1,5 @@
 import select from 'select-dom'
-import safeElementReady from '@libs/safeElementReady'
+import elementReady from 'element-ready'
 
 export default class ElementCollection {
   constructor() {
@@ -84,7 +84,7 @@ export default class ElementCollection {
     }
 
     if (!entry.promise) {
-      entry.promise = safeElementReady(entry.selector)
+      entry.promise = elementReady(entry.selector)
     }
 
     return entry.promise

src/libs/pageDetect.js

@@ -1,6 +1,6 @@
 import select from 'select-dom'
 import simpleMemoize from 'just-once'
-import safeElementReady from '@libs/safeElementReady'
+import elementReady from 'element-ready'
 import getLoggedInUserId from '@libs/getLoggedInUserId'
 import getLoggedInUserProfilePageUrl from '@libs/getLoggedInUserProfilePageUrl'
 import any from '@libs/promiseAny'
@@ -36,7 +36,7 @@ export function isLoggedInUserProfilePage() {
 export const isLoggedInUserFriendsListPage = simpleMemoize(async () => {
   if (!isFriendsListPage()) return false
 
-  await safeElementReady('#stream')
+  await elementReady('#stream')
 
   const urlA = select('.tabs .crumb').href
   const urlB = getLoggedInUserProfilePageUrl()
@@ -48,7 +48,7 @@ export const isLoggedInUserFriendsListPage = simpleMemoize(async () => {
 export const isLoggedInUserFollowersListPage = simpleMemoize(async () => {
   if (!isFollowersListPage()) return false
 
-  await safeElementReady('#stream')
+  await elementReady('#stream')
 
   const urlA = select('.tabs .crumb').href
   const urlB = getLoggedInUserProfilePageUrl()
@@ -60,7 +60,7 @@ export const isLoggedInUserFollowersListPage = simpleMemoize(async () => {
 export const isUserProfilePage = simpleMemoize(() => {
   return any([
     // 只有用户个人页面中才存在「投诉」对话框
-    safeElementReady('#overlay-report'),
+    elementReady('#overlay-report'),
     // 但是当前登录用户的个人页面中没有「投诉」对话框，需要额外判断
     isLoggedInUserProfilePage(),
   ])
@@ -133,7 +133,7 @@ export function isFriendRequestPage() {
 // 判断是否为 timeline 页面，例如首页、用户个人页面、随便看看页面等
 export const isTimelinePage = simpleMemoize(() => every([
   // timeline 的页面都有 #stream 元素
-  safeElementReady('#stream'),
+  elementReady('#stream'),
   // 管理关注请求页面也有 #stream 元素，而且 DOM 结构和一般 timeline 页面难以区分，排除之
   neg(isFriendRequestPage()),
 ]))