From adae0c9ad79d4ae313c881e9d93faf3b6cd7d639 Mon Sep 17 00:00:00 2001
From: CodFrm <code.farmer@qq.com>
Date: Thu, 28 Mar 2019 00:50:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=98=E7=9B=AE=E9=A1=B5?=
 =?UTF-8?q?=E5=81=9C=E6=AD=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cxmooc-tools/chaoxing/chaoxing.js | 8 ++++++++
 src/cxmooc-tools/chaoxing/topic.js    | 3 ++-
 src/pack-crx.js                       | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/cxmooc-tools/chaoxing/chaoxing.js b/src/cxmooc-tools/chaoxing/chaoxing.js
index d42edf22..be907f7e 100644
--- a/src/cxmooc-tools/chaoxing/chaoxing.js
+++ b/src/cxmooc-tools/chaoxing/chaoxing.js
@@ -12,6 +12,7 @@ module.exports = function () {
     this.index = 0;
     this.iframe = undefined;
     this.tag = Math.random();
+    this.complete_num = 0;
     /**
      * 查找iframe
      * @param iframeElement 
@@ -77,6 +78,7 @@ module.exports = function () {
         }
     }
 
+
     //忽略完成的任务
     function ignoreCompile(event) {
         if (config.answer_ignore && self.list[self.index] instanceof Topic) {
@@ -90,6 +92,7 @@ module.exports = function () {
                 if ($(self.iframe).attr('tag') != self.tag) {
                     return;
                 }
+                self.complete_num++;
                 event.start();
             }
         }
@@ -114,6 +117,11 @@ module.exports = function () {
             ignoreCompile(self.list[self.index]);
             return;
         }
+        if (self.complete_num <= 0) {
+            self.complete_num = 1;
+            lazySwitch();
+            return;
+        }
         let folder = $('.tabtags').find('span');
         for (let i = 0; i < folder.length; i++) {
             if ($(folder[i]).hasClass('currents')) {
diff --git a/src/cxmooc-tools/chaoxing/topic.js b/src/cxmooc-tools/chaoxing/topic.js
index 379002c5..5b8543b7 100644
--- a/src/cxmooc-tools/chaoxing/topic.js
+++ b/src/cxmooc-tools/chaoxing/topic.js
@@ -122,7 +122,8 @@ module.exports = function () {
     //监听框架,跳转抓取题目
     function listenIframe() {
         $($(self.iframe.contentDocument).find('#frame_content')[0]).on("load", function () {
-            if ($(this).attr('src').indexOf('modules/work') > 0) {
+            common.log("topic load " + this.contentWindow.location.href);
+            if (this.contentWindow.location.href.indexOf('selectWorkQuestionYiPiYue') > 0) {
                 self.document = this.contentDocument;
                 reloadInit();
             }
diff --git a/src/pack-crx.js b/src/pack-crx.js
index 04c9324d..ce5e9d06 100644
--- a/src/pack-crx.js
+++ b/src/pack-crx.js
@@ -14,7 +14,7 @@ const crx = new ChromeExtension({
 });
 
 crx.load(['./build/cxmooc-tools/manifest.json',
-    './build/cxmooc-tools/img/navtu.png',
+    './build/cxmooc-tools/img/navtu.webp',
     './build/cxmooc-tools/img/logo.png',
     './build/cxmooc-tools/src/*'
 ]).then(crx => crx.pack()).then(crxBuffer => {