[Update] Use window.onload with document_end instead of chrome.tabs.o…

…nUpdated
mkobayashime · Jun 3, 2020 · 85468b4 · 85468b4
1 parent c8405d4
commit 85468b4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -8,7 +8,6 @@ const PATHS = require('./paths');
 // Merge webpack configuration files
 const config = merge(common, {
   entry: {
-    background: PATHS.src + '/background.js',
     contentScript: PATHS.src + '/contentScript.js',
   },
 });

diff --git a/public/manifest.json b/public/manifest.json
@@ -7,20 +7,12 @@
     "16": "icons/icon_16.png",
     "128": "icons/icon_128.png"
   },
-  "background": {
-    "scripts": [
-      "background.js"
-    ],
-    "persistent": false
-  },
-  "permissions": [
-    "tabs"
-  ],
   "content_scripts": [
     {
       "matches": [
         "https://tweetdeck.twitter.com/"
       ],
+      "run_at": "document_end",
       "js": [
         "contentScript.js"
       ]

diff --git a/src/background.js b/src/background.js
diff --git a/src/contentScript.js b/src/contentScript.js
@@ -1,10 +1,8 @@
 "use strict"
 
-chrome.runtime.onMessage.addListener((message) => {
-  if (message.type === "updated") {
-    getDom()
-  }
-})
+window.onload = () => {
+  getDom()
+}
 
 const getDom = () => {
   const promise = new Promise((resolve) => {
@@ -17,7 +15,7 @@ const getDom = () => {
       }
     }, 250)
   })
-  
+
   promise.then((dom) => {
     setShortcuts(dom.showBtn, dom.application)
   })
@@ -29,7 +27,7 @@ const setShortcuts = (showBtn, application) => {
   const isOpen = () => {
     return application.classList.contains('hide-detail-view-inline')
   }
-  
+
   const clickAccount = (e) => {
     if (!isOpen()) {
       showBtn.click()
@@ -45,14 +43,14 @@ const setShortcuts = (showBtn, application) => {
     // HTML tags to be detected as typing
     const inputTags = ["INPUT", "TEXTAREA", "SELECT"]
 
-    if(inputTags.indexOf(tagName) !== -1) {
+    if (inputTags.indexOf(tagName) !== -1) {
       return true
     }
   }
 
   document.onkeyup = e => {
     if (!isTyping()) {
-      switch(e.shiftKey && e.which) {
+      switch (e.shiftKey && e.which) {
         case 49:
           clickAccount(0)
           break