From 1bc28da9a1a3df592fd26ed2ac7716e41a1cd623 Mon Sep 17 00:00:00 2001
From: root <303797380@qq.com>
Date: Mon, 10 Oct 2016 16:31:48 +0800
Subject: [PATCH 1/3] add custom api key function

---
 popup.html                   |  4 ++++
 src/javascript/background.js | 22 +++++++++++++++++++---
 src/javascript/popup.js      | 24 ++++++++++++++++++++++--
 src/javascript/utility.js    | 14 +++++++++++---
 4 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/popup.html b/popup.html
index 00ba320..d5e055e 100644
--- a/popup.html
+++ b/popup.html
@@ -65,6 +65,10 @@
     <div class="sub-menu">
       <input type="radio" name="showPosition" value="near" id="showPositionNear"><label for="showPositionNear">翻译结果显示在单词附近</label>
     </div>
+    <div>
+    <input type="text" placeholder="key" id="userkey">
+    <input type="text" placeholder="keyfrom" id="userkeyfrom">
+    </div>
     <div class="sub-menu">
       <input type="checkbox" name="autoHide" id="autoHide"><label for="showDuration"><b id="currentDuration"></b>秒后隐藏结果</label>
       <input type="range" name="showDuration" min="3" max="8" id="showDuration">
diff --git a/src/javascript/background.js b/src/javascript/background.js
index a791e4c..e6594d9 100644
--- a/src/javascript/background.js
+++ b/src/javascript/background.js
@@ -1,8 +1,10 @@
 function ChaZD(queryWord, useHttps, wordSource, sendResponse) {
     this.wordSource = wordSource;
     this.useHttps = useHttps;
-    var url = (useHttps ? urls.dictHttps : urls.dict) + queryWord;
-    //console.log("Query url: " + url);
+    var basicurl = getbasicurl(useHttps);
+    console.log(basicurl);
+    var url = basicurl + queryWord;
+    console.log("Query url: " + url);
     var queryResult = {};
     var self = this;
     var xhr = new XMLHttpRequest();
@@ -22,7 +24,21 @@ function ChaZD(queryWord, useHttps, wordSource, sendResponse) {
     };
     xhr.send();
 }
-
+function getbasicurl(useHttps) {
+    var thisurl = (useHttps ? urls.dictHttps : urls.dict);
+    var chazduserkey = localStorage.getItem("chazduserkey");
+    var chazduserkeyfrom = localStorage.getItem("chazduserkeyfrom");
+    console.log(chazduserkey,chazduserkeyfrom);
+    if(chazduserkey && chazduserkey !== "" && chazduserkeyfrom && chazduserkeyfrom !== "") {
+        if (useHttps) {
+            thisurl = fmt(templateUrls.dictHttps, chazduserkey, chazduserkeyfrom);
+        } else {
+            thisurl = fmt(templateUrls.dict, chazduserkey, chazduserkeyfrom);
+        }   
+    }   
+    
+    return thisurl;
+}
 ChaZD.prototype.checkErrorCode = function (errorCode) {
     var response = {
         "message": "",
diff --git a/src/javascript/popup.js b/src/javascript/popup.js
index 27b6924..ce170b3 100644
--- a/src/javascript/popup.js
+++ b/src/javascript/popup.js
@@ -148,6 +148,8 @@ var tips = document.querySelector("#tips");
 var toggleKey = document.querySelector("#toggle-key");
 var useHttps = document.querySelector("#useHttps");
 var useHttpsValue = false;
+var userkey = document.querySelector("#userkey");
+var userkeyfrom = document.querySelector("#userkeyfrom");
 
 chrome.storage.sync.get(null, function (items) { 
     if(items.currentWord !== "") {
@@ -240,6 +242,12 @@ chrome.storage.sync.get(null, function (items) {
         autoHide.nextSibling.classList.add("unactive");
         showDuration.disabled = true;
     }
+    if (localStorage.getItem("userkey")) {
+        userkey.value = localStorage.getItem("userkey");
+    }
+    if (localStorage.getItem("userkeyfrom")) {
+        userkeyfrom.value = localStorage.getItem("userkeyfrom");
+    }
     currentDuration.innerHTML = showDuration.value = items.showDuration;
 });
 
@@ -379,8 +387,20 @@ toggleKey.onchange = function (event) {
 // })
 
 //在popup页内 Enter键 查询选中部分
-document.addEventListener('keyup',function(e){
+document.addEventListener("keyup",function(e){
     if(document.activeElement.tagName=="BODY" && e.which==13){
         queryInPopup(window.getSelection().toString());
     }
-});
\ No newline at end of file
+});
+userkey.addEventListener("change", function(event){
+    localStorage.setItem("chazduserkey",this.value);
+    chrome.storage.local.set({"userkey" : this.value}, function() {
+        console.log("[ChaZD] Success update settings userkey = " + this.value);
+    });
+});
+userkeyfrom.addEventListener("change", function(event){
+    localStorage.setItem("chazduserkeyfrom",this.value);
+    chrome.storage.local.set({"userkeyfrom" : this.value}, function() {
+        console.log("[ChaZD] Success update settings userkeyfrom = " + this.value);
+    });
+});
diff --git a/src/javascript/utility.js b/src/javascript/utility.js
index 0177041..6f28df9 100644
--- a/src/javascript/utility.js
+++ b/src/javascript/utility.js
@@ -1,6 +1,6 @@
 var api = {
-    key: 1116151381,
-    keyfrom : "youdaocidian"
+    key: 2078867566,
+    keyfrom : "lytofbblogger"
 };
 
 var urls = {
@@ -10,6 +10,12 @@ var urls = {
     voiceHttps : "https://dict.youdao.com/dictvoice?audio=",
 };
 
+var templateUrls = {
+    dict : "http://fanyi.youdao.com/openapi.do?keyfrom=#{2}&key=#{1}&type=data&doctype=json&version=1.1&q=",
+    voice : "http://dict.youdao.com/dictvoice?audio=",
+    dictHttps : "https://fanyi.youdao.com/openapi.do?keyfrom=#{2}&key=#{1}&type=data&doctype=json&version=1.1&q=",
+    voiceHttps : "https://dict.youdao.com/dictvoice?audio=",
+};
 var settings = {
     selectMode : "mouseSelect",     //划词的形式：直接划词 or Ctrl + 划词
     showPosition : "near",          //划词翻译结果显示的位置
@@ -22,6 +28,8 @@ var settings = {
     showDuration: 3,                //翻译结果显示持续时间
     defaultVoice: 1,                //划词默认发音：1--英音；2--美音
     useHttps: false,                //是否使用 HTTPS 的接口
+    userkey:undefined,              //用户自定义key
+    userkeyfrom:undefined           //用户自定义keyfrom
 };
 
 var frame = {
@@ -79,4 +87,4 @@ function fmt() {
 
 function trim(str) {
     return str.replace(/(^\s*)|(\s*$)/g, "");
-}
\ No newline at end of file
+}

From 0331bfb52f51224c854b3d8f084fecef9aed2740 Mon Sep 17 00:00:00 2001
From: root <303797380@qq.com>
Date: Mon, 10 Oct 2016 16:35:41 +0800
Subject: [PATCH 2/3] remove debug message

---
 src/javascript/background.js | 6 +++---
 src/javascript/popup.js      | 4 ++--
 src/javascript/utility.js    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/javascript/background.js b/src/javascript/background.js
index e6594d9..55c650a 100644
--- a/src/javascript/background.js
+++ b/src/javascript/background.js
@@ -2,9 +2,9 @@ function ChaZD(queryWord, useHttps, wordSource, sendResponse) {
     this.wordSource = wordSource;
     this.useHttps = useHttps;
     var basicurl = getbasicurl(useHttps);
-    console.log(basicurl);
+    //console.log(basicurl);
     var url = basicurl + queryWord;
-    console.log("Query url: " + url);
+    //console.log("Query url: " + url);
     var queryResult = {};
     var self = this;
     var xhr = new XMLHttpRequest();
@@ -28,7 +28,7 @@ function getbasicurl(useHttps) {
     var thisurl = (useHttps ? urls.dictHttps : urls.dict);
     var chazduserkey = localStorage.getItem("chazduserkey");
     var chazduserkeyfrom = localStorage.getItem("chazduserkeyfrom");
-    console.log(chazduserkey,chazduserkeyfrom);
+    //console.log(chazduserkey,chazduserkeyfrom);
     if(chazduserkey && chazduserkey !== "" && chazduserkeyfrom && chazduserkeyfrom !== "") {
         if (useHttps) {
             thisurl = fmt(templateUrls.dictHttps, chazduserkey, chazduserkeyfrom);
diff --git a/src/javascript/popup.js b/src/javascript/popup.js
index ce170b3..5037aa2 100644
--- a/src/javascript/popup.js
+++ b/src/javascript/popup.js
@@ -395,12 +395,12 @@ document.addEventListener("keyup",function(e){
 userkey.addEventListener("change", function(event){
     localStorage.setItem("chazduserkey",this.value);
     chrome.storage.local.set({"userkey" : this.value}, function() {
-        console.log("[ChaZD] Success update settings userkey = " + this.value);
+        //console.log("[ChaZD] Success update settings userkey = " + this.value);
     });
 });
 userkeyfrom.addEventListener("change", function(event){
     localStorage.setItem("chazduserkeyfrom",this.value);
     chrome.storage.local.set({"userkeyfrom" : this.value}, function() {
-        console.log("[ChaZD] Success update settings userkeyfrom = " + this.value);
+        //console.log("[ChaZD] Success update settings userkeyfrom = " + this.value);
     });
 });
diff --git a/src/javascript/utility.js b/src/javascript/utility.js
index 6f28df9..1c727a3 100644
--- a/src/javascript/utility.js
+++ b/src/javascript/utility.js
@@ -1,6 +1,6 @@
 var api = {
-    key: 2078867566,
-    keyfrom : "lytofbblogger"
+    key: 1116151381,
+    keyfrom : "youdaocidian"
 };
 
 var urls = {

From 545b6383c7c468e7e27bc1e583fdb136588295e5 Mon Sep 17 00:00:00 2001
From: root <303797380@qq.com>
Date: Mon, 10 Oct 2016 16:40:44 +0800
Subject: [PATCH 3/3] adjust blockHeight

---
 src/javascript/popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/javascript/popup.js b/src/javascript/popup.js
index 5037aa2..01d475a 100644
--- a/src/javascript/popup.js
+++ b/src/javascript/popup.js
@@ -130,7 +130,7 @@ function totalHeight(className) {
     return sum + 10;
 }
 
-var blockHeight = totalHeight("top-menu") + totalHeight("sub-menu") + totalHeight("carved") + 32;
+var blockHeight = totalHeight("top-menu") + totalHeight("sub-menu") + totalHeight("carved") + 32 + 56;
 var linkQuery = document.querySelector("#linkQuery");
 var noSelect = document.querySelector("#noSelect");
 var mouseSelect = document.querySelector("#mouseSelect");