fix for autoRun & collocation

Author: FLYFAN

background.html

@@ -19,5 +19,6 @@
   <script src="./keys/key_2_8.js"></script>
   <script src="./keys/key_3_1.js"></script>
   <script src="./keys/key_3_2.js"></script>
+  <script src="./keys/key_3_7.js"></script>
 </head>
 </html>

key-config.js

@@ -8,5 +8,6 @@ window.keys = [
   'key_2_7',
   'key_2_8',
   'key_3_1',
-  'key_3_2'
+  'key_3_2',
+  'key_3_7'
 ]

keys/key_3_7.js

@@ -32,8 +32,8 @@ window.key_3_7 = {
         content: `1.in   2.on   3.in  4.in  5.into  6.off  7.in  8.to`
     },
     'key-139-7-7-2': {
-        type: `cloze`,
-        content: `1. e  2. 3. a  4. d  5. f   6. c`
+        type: `collocation`,
+        content: `1. e harassment  2.b spectrum 3.a futures  4.d sharply  5.f increases   6.c grief`
 	},
     'key-139-7-7-3':
         {

main/background.js

@@ -7,8 +7,8 @@ chrome.runtime.onInstalled.addListener(function () {
   const data = {
     isRun: true,
     setting: {
-      correctRate: 97,
-      autoRun:false
+      correctRate: 100,
+      autoRun: false
     }
   }
 

main/content-script.js

@@ -2,7 +2,7 @@
 
 //通过DOM判断是否为Unipus
 function isTarget() {
-    if (window.location.href.match(/book\d+\//)) 
+    if (window.location.href.match(/book\d+\//))
         return true
     return false
 }
@@ -12,10 +12,10 @@ var autoRun = false
 
 function getPageInfo() {
     var regex_result = window.location.href.match(/book(?<BookID>\d+)\/.+UnitID=(?<UnitID>\d+)&SectionID=(?<SectionID>\d+)&SisterID=(?<SisterID>\d+)/)
-    if(regex_result)
+    if (regex_result)
         locator = regex_result.groups
-    else if(autoRun)
-        document.querySelector('.item1 a') &&  document.querySelector('.item1 a').click()
+    else if (autoRun)
+        document.querySelector('.item1 a') && document.querySelector('.item1 a').click()
 }
 
 var keyTab, keyData
@@ -30,6 +30,8 @@ var setting
 
 //在Storage中搜寻答案
 function searchKey() {
+    if (!locator)
+        return
     let { BookID, UnitID, SectionID, SisterID } = locator
     keyTab = `key-${BookID}-${UnitID}-${SectionID}-${SisterID}`
     console.log(`keyTab=${keyTab}`)
@@ -68,16 +70,14 @@ function BBQ(str) {
 //转化答案
 function parseKey(type, content) {
     let result = BBQ(content)
-    if (type === 'blank' || type === 'select') 
+    if (type === 'blank' || type === 'select' || type === 'collocation')
         return result
     else if (type === 'mc')
         return result.join('').replace(/[ ]/g, "").toLowerCase()
     else if (type === 'cloze')
         return result.join('').replace(/[ ]/g, "").toLowerCase().split('-').join('')
     else if (type === 'blankB')
         return result.join(' ').split(' ')
-    else if (type === 'collocation')
-        return result.map(e => e.split(' ').slice(1).join(' '))
     return content
 }
 
@@ -120,7 +120,7 @@ function doCollocation(keys = []) {
     let texts = Array.prototype.map.call(greens, item => item.innerHTML)
     keys.forEach((key, index) => {
         for (let i = 0; texts[i]; i++) {
-            if (key === texts[i].slice(3)) {
+            if (key === texts[i]) {
                 greens[index].innerHTML = texts[i]
                 greens[index].id = `Item_${i}`
                 break
@@ -137,10 +137,10 @@ function doCloze(content = '') {
     console.log('blank be filled')
 }
 
-function doSelect(content = []){
-    content.forEach((key,index) => 
+function doSelect(content = []) {
+    content.forEach((key, index) =>
         Array.from(document.querySelectorAll(`[name=Blank_${index}] > option`)).forEach(opt => {
-            if(opt.value == key)
+            if (opt.value == key)
                 opt.selected = true
         })
     )
@@ -156,14 +156,14 @@ function doBlank(content = []) {
 }
 
 function doBlankB(content = []) {
-    for (let i = 0; content[i]; i++) 
+    for (let i = 0; content[i]; i++)
         document.getElementById(`Blank_0_${i}`).value = content[i]
 }
 
 const mcf = { 'a': 0, 'b': 1, 'c': 2, 'd': 3 }
 
 function doMC(content = '') {
-    for (let i = 0; i < content.length; i++) 
+    for (let i = 0; i < content.length; i++)
         document.getElementsByName(`Radio_${i}`)[mcf[content.charAt(i)]].click()
     console.log('MC be clicked')
 }