ververcpp · jeremylee1 · Dec 3, 2015 · Dec 3, 2015 · Jan 19, 2016 · Mar 18, 2016
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+###ver 0.8.20
++ 重新整理代码结构，重新组织类结构，方便扩展
++ 新增扇贝单词、好学单词查询接口
++ 新增自动加入扇贝单词生词本功能，方便学习
++ 新增扇贝单词登陆检测，当启用自动加入生词本时，若没有登陆扇贝单词，则提示登陆并跳转
+
 ###ver 0.8.19
 + 修改边栏显示的查词结果被某些网页导航条遮挡的 bug
 

diff --git a/ChaZD.crx b/ChaZD.crx
diff --git a/README.md b/README.md
@@ -2,12 +2,13 @@ ChaZD
 =====
 
 ChaZD 查字典，简洁易用的英汉字典扩展程序，支持划词哦:)
-翻译结果和发音朗读由**有道翻译**驱动。
+翻译结果和发音朗读由**有道翻译**驱动；
+新增自动加入扇贝单词生词本功能，方便学习；
+新增扇贝单词登陆检测，当启用自动加入生词本时，若没有登陆扇贝单词，则提示登陆并跳转。
 
 获取
 -----------
-+ [Chrome 网上应用商店](https://chrome.google.com/webstore/detail/chazd/nkiipedegbhbjmajlhpegcpcaacbfggp) 
-+ [crx 文件](https://github.com/ververcpp/ChaZD/blob/master/ChaZD.crx?raw=true)  
++ [crx 文件](https://github.com/XYUU/ChaZD/blob/master/ChaZD.crx?raw=true)
 
 **注**：安装扩展后，第一次使用请刷新要查词的页面，划词功能才会生效；  
 **注2**：非中文版Chrome浏览器的用户，如出现插件弹出窗口字体无法正常显示的情况，麻烦请更改浏览器的最小字号为12px

diff --git a/manifest.json b/manifest.json
@@ -1,32 +1,35 @@
 {
   "manifest_version": 2,
-
-  "name": "ChaZD",
-  "version": "0.8.19",
-  "description": "ChaZD 查字典，简洁易用的英汉字典扩展程序，支持划词哦:)",
+  "name": "好学单词",
+  "version": "0.8.20",
+  "description": "好学单词，简洁易用的英汉字典扩展程序，支持划词哦:)",
 
   "permissions": [
     "https://dict.youdao.com/*",
     "https://fanyi.youdao.com/*",
     "http://dict.youdao.com/*",
     "http://fanyi.youdao.com/*",
+    "http://dict.xyuu.com.cn/*",
+    "http://*.shanbay.com/*",
     "contextMenus",
     "tabs",
     "storage",
     "notifications"
   ],
-
+  //"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self';media-src '*'",
   "options_page": "options.html",
 
   "background": {
       "persistent": true,
       "scripts": [ "public/js/utility.min.js", "public/js/background.min.js" ]
+      //"scripts": [ "src/javascript/utility.js", "src/javascript/background.js" ]
    },
 
   "content_scripts": [ {
     "all_frames": true,
     "css": ["public/css/inPage.min.css"],
     "js": ["public/js/utility.min.js", "public/js/selection.min.js"],
+    //"js": ["src/javascript/utility.js", "src/javascript/selection.js"],
     "matches": ["<all_urls>"]
 
   } ],

diff --git a/options.html b/options.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <title>ChaZD Options</title>
+  <title>好学单词 设置</title>
 </head>
 <body>
 

diff --git a/popup.html b/popup.html
@@ -29,10 +29,22 @@
       <input type="checkbox" name="linkQuery" id="linkQuery"><label for="linkQuery">使用 shift 辅助链接划词</label>
       <a href="#" title="如果想对某个链接上的单词进行划词，为避免无法取词的问题，可以按住shift键，此时链接会变成可取词的状态，这样就可以轻松划词查词啦:)" class="link-query help">(鼠标悬停查看说明)</a>
     </div>
+    <div class="top-menu">
+      <label for="useCtrl" class="sub-title">使用
+      <select id="open-api">
+        <option value="shanbay">扇贝单词</option>
+        <option value="xyuu">好学单词</option>
+        <option value="youdao">有道翻译</option>
+      </select>
+      接口</label>
+    </div>
     <div class="top-menu">
       <input type="checkbox" name="useHttps" id="useHttps"><label for="useHttps">开启 HTTPS 接口</label>
       <a href="#" title="如果出现无法查词的问题，建议关闭此选项" class="link-query help">(说明)</a>
     </div>
+    <div class="top-menu">
+      <input type="checkbox" name="autoLearn" id="autoLearn"><label for="autoLearn">自动加入生词本</label>
+    </div>
     <hr class="carved">
     <div class="top-menu">
       <input type="radio" name="selectMode" id="noSelect"><label for="noSelect">关闭划词翻译功能</label>
@@ -54,12 +66,13 @@
       <input type="checkbox" name="autoAudio" id="autoAudio"><label for="autoAudio">划词后自动发音</label>
     </div>
     <div class="top-menu">
-      <span class="sub-title">默认发音 --</span> 
+      <span class="sub-title">默认发音</span>
+      <input type="radio" name="defaultVoice" id="human" class="sub-button"><label for="human" class="sub-label">真人发音</label>
       <input type="radio" name="defaultVoice" id="defaultUk" class="sub-button"><label for="defaultUk" class="sub-label">英音</label>
       <input type="radio" name="defaultVoice" id="defaultUs" class="sub-button"><label for="defaultUs" class="sub-label">美音</label>   
     </div>
     <hr class="carved">
-    <div class="sub-menu">
+    <div class="top-menu">
       <input type="radio" name="showPosition" value="side" id="showPositionSide"><label for="showSide">翻译结果显示在浏览器边缘</label>
     </div>
     <div class="sub-menu">
@@ -70,18 +83,22 @@
       <input type="range" name="showDuration" min="3" max="8" id="showDuration">
     </div>
   </div>
-
   <footer>
     <div class="setting-button link" id="setting-button" title="设置"></div>
-    Powered By <img src="http://www.youdao.com/help/fanyiapi/brand/002.gif" alt="有道翻译">
+    Powered By <span id="powered-by"><img src="http://www.youdao.com/help/fanyiapi/brand/002.gif" alt="有道翻译"></span>
     <div class="contact-info">
       <span id="score" class="link" title="亲，给个好评吧:)"></span>
       <span id="email" class="link" title="如有问题可以发邮件"></span>
       <span id="issue" class="link" title="在Github上提出问题或建议"></span>
       <span id="source" class="link" title="源码在这里，欢迎Fork"></span>
     </div>
   </footer>
+
   <script src="public/js/utility.min.js"></script>
   <script src="public/js/popup.min.js"></script>
+  <!--
+  <script src="src/javascript/utility.js"></script>
+  <script src="src/javascript/popup.js"></script>
+  -->
 </body>
 </html>
diff --git a/public/js/background.min.js b/public/js/background.min.js