Merge branch 'master' of https://github.com/PUGE/assist into master

back/popup.js

@@ -42,113 +42,120 @@ document.getElementsByClassName('userInfo')[0].onclick = function () {
 
 let dataCopy = null
 
-chrome.storage.sync.get('userInfo', function(data) {
-  console.log(data)
-  userInfo = data.userInfo
-  if (userInfo && userInfo.username && userInfo.password && userInfo.session) {
-    document.querySelector('.userInfo').innerHTML = `${userInfo.username}`
-  }
-  // alert("页面加载完成！"); 
-  // 获取是否有脚本
-  getSchemeData.then((dataTemp) => {
-    console.log(dataTemp)
-    const scriptBox = document.getElementsByClassName('script-box')[0]
-    if (dataTemp.edition > 1) {
-      chrome.notifications.create(null, {
-        type: 'basic',
-        iconUrl: 'img/48.png',
-        title: '版本过低',
-        message: '有新版本请在弹出页面下载最新插件!'
-      })
-      // console.log(unescape(dataTemp.data))
-      chrome.tabs.create({url: dataTemp.url})
-      return
+function load() {
+  chrome.storage.sync.get('userInfo', function(data) {
+    console.log(data)
+    userInfo = data.userInfo
+    if (userInfo && userInfo.username && userInfo.password && userInfo.session) {
+      document.querySelector('.userInfo').innerHTML = `${userInfo.username}`
     }
-    const data = dataTemp['data']
-    if (dataTemp.err !== 0 || data.length == 0) {
-      scriptBox.classList.add('no-scheme')
-      scriptBox.classList.remove('scheme')
-    } else {
-      dataCopy = data
-      let buttonHtml = ''
-      let ind = 0
-      data.forEach(element => {
-        buttonHtml += `<button data-ind="${ind}">${element.name}</button>`
-        ind++
-      });
-      document.querySelector('.button-box').innerHTML = buttonHtml
-      scriptBox.classList.add('scheme')
-      setTimeout(() => {
-        const buttonList = document.getElementsByTagName('button')
-        for (const key in buttonList) {
-          if (Object.hasOwnProperty.call(buttonList, key)) {
-            const element = buttonList[key];
-            element.onclick = function () {
-              
-              let index = this.getAttribute("data-ind")
-              index = parseInt(index)
-              let dataTempCopy = dataCopy[index]
-              switch (dataTempCopy.type) {
-                case 'run': {
-                  chrome.notifications.create(null, {
-                    type: 'basic',
-                    iconUrl: 'img/48.png',
-                    title: dataTempCopy.name,
-                    message: '远程方案已载入并运行!'
-                  })
-                  // console.log(unescape(dataTemp.data))
-                  if (dataTempCopy.data) {
-                    chrome.tabs.executeScript(dataTemp.tabInfo.id, {code: unescape(dataTempCopy.data)})
-                  }
-                  if (dataTempCopy.style || dataTempCopy.script) {
-                    dataTempCopy.style = dataTempCopy.style || '[]'
-                    dataTempCopy.script = dataTempCopy.script || '[]'
-                    let temp = `
-                    function loadScript(url, callback) {
-                      var script = document.createElement("script")
-                      script.type = "text/javascript";
-                      if (script.readyState) { //IE
-                          script.onreadystatechange = function () {
-                              if (script.readyState == "loaded" || script.readyState == "complete") {
-                                  script.onreadystatechange = null;
-                                  if (callback) callback();
-                              }
-                          };
-                      } else { //Others
-                          script.onload = function () {
-                              if (callback) callback();
-                          };
-                      }
-                      script.src = url;
-                      var head = document.head || document.getElementsByTagName('head')[0];
-                      head.appendChild(script);
-                  }
-                  
-                  function loadCSS (url) {
-                      var link = document.createElement("link");
-                      link.rel = "stylesheet";
-                      link.type = "text/css";
-                  
-                      link.href = url;
-                  
-                      document.getElementsByTagName("head")[0].appendChild(link);
+    // alert("页面加载完成！"); 
+    // 获取是否有脚本
+    getSchemeData.then((dataTemp) => {
+      console.log(dataTemp)
+      const scriptBox = document.getElementsByClassName('script-box')[0]
+      if (dataTemp.edition > 1) {
+        chrome.notifications.create(null, {
+          type: 'basic',
+          iconUrl: 'img/48.png',
+          title: '版本过低',
+          message: '有新版本请在弹出页面下载最新插件!'
+        })
+        // console.log(unescape(dataTemp.data))
+        chrome.tabs.create({url: dataTemp.url})
+        return
+      }
+      const data = dataTemp['data']
+      if (dataTemp.err !== 0 || data.length == 0) {
+        scriptBox.classList.add('no-scheme')
+        scriptBox.classList.remove('scheme')
+      } else {
+        dataCopy = data
+        let buttonHtml = ''
+        let ind = 0
+        data.forEach(element => {
+          buttonHtml += `<button data-ind="${ind}">${element.name}</button>`
+          ind++
+        });
+        document.querySelector('.button-box').innerHTML = buttonHtml
+        scriptBox.classList.add('scheme')
+        setTimeout(() => {
+          const buttonList = document.getElementsByTagName('button')
+          for (const key in buttonList) {
+            if (Object.hasOwnProperty.call(buttonList, key)) {
+              const element = buttonList[key];
+              element.onclick = function () {
+                
+                let index = this.getAttribute("data-ind")
+                index = parseInt(index)
+                let dataTempCopy = dataCopy[index]
+                switch (dataTempCopy.type) {
+                  case 'run': {
+                    chrome.notifications.create(null, {
+                      type: 'basic',
+                      iconUrl: 'img/48.png',
+                      title: dataTempCopy.name,
+                      message: '远程方案已载入并运行!'
+                    })
+                    // console.log(unescape(dataTemp.data))
+                    if (dataTempCopy.data) {
+                      chrome.tabs.executeScript(dataTemp.tabInfo.id, {code: unescape(dataTempCopy.data)})
+                    }
+                    if (dataTempCopy.style || dataTempCopy.script) {
+                      dataTempCopy.style = dataTempCopy.style || '[]'
+                      dataTempCopy.script = dataTempCopy.script || '[]'
+                      let temp = `
+                      function loadScript(url, callback) {
+                        var script = document.createElement("script")
+                        script.type = "text/javascript";
+                        if (script.readyState) { //IE
+                            script.onreadystatechange = function () {
+                                if (script.readyState == "loaded" || script.readyState == "complete") {
+                                    script.onreadystatechange = null;
+                                    if (callback) callback();
+                                }
+                            };
+                        } else { //Others
+                            script.onload = function () {
+                                if (callback) callback();
+                            };
+                        }
+                        script.src = url;
+                        var head = document.head || document.getElementsByTagName('head')[0];
+                        head.appendChild(script);
+                    }
+                    
+                    function loadCSS (url) {
+                        var link = document.createElement("link");
+                        link.rel = "stylesheet";
+                        link.type = "text/css";
+                    
+                        link.href = url;
+                    
+                        document.getElementsByTagName("head")[0].appendChild(link);
+                    }
+                    ${dataTempCopy.style}.forEach(element => {
+                      loadCSS(element)
+                    });
+                    ${dataTempCopy.script}.forEach(element => {
+                      loadScript(element)
+                    });
+                      `
+                      chrome.tabs.executeScript(dataTemp.tabInfo.id, {code: unescape(temp)})
+                    }
+                    break
                   }
-                  ${dataTempCopy.style}.forEach(element => {
-                    loadCSS(element)
-                  });
-                  ${dataTempCopy.script}.forEach(element => {
-                    loadScript(element)
-                  });
-                    `
-                    chrome.tabs.executeScript(dataTemp.tabInfo.id, {code: unescape(temp)})
-                  }
-                  break
                 }
               }
             }
           }
-        }
-      }, 0);
-    }
+        }, 0);
+      }
+    })
   })
-})
+}
+load()
+
+document.getElementsByClassName('.no-script')[0].onclick = function () {
+  load()
+}

manifest.json

@@ -1,7 +1,7 @@
 {
 	"manifest_version": 2,
 	"name": "脚本助手",
-	"version": "1.1.9",
+	"version": "1.1.10",
 	"description": "脚本助手",
 	"icons": {
 		"16": "./img/16.png",