词典君正在翻译。。。"),a?($input.value=a,chrome.extension.sendMessage({queryWord:a,source:"popup"},buildResult)):chrome.extension.sendMessage({queryWord:$input.value,source:"popup"},buildResult)}function buildVoice(a){var b=a.getAttribute("data-src"),c=document.createElement("audio");c.setAttribute("src",b),a.appendChild(c),c.addEventListener("ended",function(){this.load()}),a.addEventListener("click",function(){c.play()})}function createLink(a,b){a.addEventListener("click",function(){chrome.tabs.create({url:b})})}function totalHeight(a){for(var b=document.getElementsByClassName(a),c=b.length,d=0,e=0;c>e;e++)d+=b[e].scrollHeight;return d+10}var $button=document.querySelector("#search"),$tipsContainer=document.querySelector("#tips"),$input=document.querySelector("#query-word"),$queryResultContainer=document.querySelector("#query-result");-1!==window.navigator.platform.toLowerCase().indexOf("mac")&&(document.querySelector("#ctrl-option").firstChild.nodeValue="Command"),$tipsContainer.classList.contains("unshow")||$tipsContainer.classList.add("unshow");var buildResult=function(a){var b=a,c="";if("query success"==b.validMessage){c+=b.titleBlock,void 0!==b.basicBlock&&(c+=b.basicBlock),void 0!==b.webBlock&&(c+=b.webBlock),$queryResultContainer.innerHTML=c;var d,e,f=document.querySelectorAll(".voice-container");for(d=0,e=f.length;e>d;d++)buildVoice(f[d])}else $queryResultContainer.innerHTML=20==b.errorCode?"这段文字太长，词典君无能为力了（┬_┬）
试试短一点的吧~
":40==b.errorCode?"对不起，这段文字太高深了，请饶过词典君吧（┬_┬）
":"词典君罢工啦（┬_┬）
是不是网络不太好？
稍后再试一次吧
"};$button.addEventListener("click",function(){queryInPopup()}),$input.select(),$input.addEventListener("input",function(){var a=$input.value;setTimeout(function(){$input.value===a&&queryInPopup()},500)});var issue=document.querySelector("#issue"),email=document.querySelector("#email"),source=document.querySelector("#source"),keySet=document.querySelector("#key-set"),score=document.querySelector("#score");createLink(email,"mailto:ververcpp@gmail.com"),createLink(source,"https://github.com/ververcpp/ChaZD"),createLink(issue,"https://github.com/ververcpp/ChaZD/issues/new"),createLink(keySet,"chrome://extensions/configureCommands"),createLink(score,"https://chrome.google.com/webstore/detail/chazd/nkiipedegbhbjmajlhpegcpcaacbfggp"),document.querySelector("#setting-button").addEventListener("click",function(){var a=document.getElementById("settings");a.classList.toggle("active"),a.style.height=a.classList.contains("active")?blockHeight+"px":0});var blockHeight=totalHeight("top-menu")+totalHeight("sub-menu")+totalHeight("carved")+20,linkQuery=document.querySelector("#linkQuery"),noSelect=document.querySelector("#noSelect"),mouseSelect=document.querySelector("#mouseSelect"),useCtrl=document.querySelector("#useCtrl"),autoAudio=document.querySelector("#autoAudio"),showPositionSide=document.querySelector("#showPositionSide"),showPositionNear=document.querySelector("#showPositionNear"),turnOffTips=document.querySelector("#turn-off-tips"),tips=document.querySelector("#tips"),toggleKey=document.querySelector("#toggle-key");chrome.storage.sync.get(null,function(a){""!==a.currentWord&&queryInPopup(a.currentWord),linkQuery.checked=a.linkQuery===!0?!0:!1,autoAudio.checked=a.autoAudio===!0?!0:!1,"noSelect"===a.selectMode&&(noSelect.checked=!0,toggleKey.disabled=!0,autoAudio.disabled=!0),"mouseSelect"===a.selectMode&&(mouseSelect.checked=!0,toggleKey.disabled=!0,autoAudio.disabled=!1),"useCtrl"===a.selectMode&&(useCtrl.checked=!0,toggleKey.disabled=!1,autoAudio.disabled=!1),a.showTips&&tips.classList.remove("unshow"),"side"===a.showPosition?showPositionSide.checked=!0:"near"===a.showPosition&&(showPositionNear.checked=!0),"ctrl"===a.toggleKey?toggleKey.selectedIndex=0:"alt"===a.toggleKey?toggleKey.selectedIndex=1:"shift"===a.toggleKey&&(toggleKey.selectedIndex=2)}),linkQuery.addEventListener("click",function(){var a=linkQuery.checked;chrome.storage.sync.set({linkQuery:a},function(){})}),autoAudio.addEventListener("click",function(){var a=autoAudio.checked;chrome.storage.sync.set({autoAudio:a},function(){})}),turnOffTips.addEventListener("click",function(){tips.classList.add("unshow"),chrome.storage.sync.set({showTips:!1},function(){})}),noSelect.addEventListener("click",function(){toggleKey.disabled=!0,autoAudio.disabled=!0,chrome.storage.sync.set({selectMode:"noSelect"},function(){})}),mouseSelect.addEventListener("click",function(){toggleKey.disabled=!0,autoAudio.disabled=!1,chrome.storage.sync.set({selectMode:"mouseSelect"},function(){})}),useCtrl.addEventListener("click",function(){toggleKey.disabled&&(toggleKey.disabled=!1),autoAudio.disabled=!1,chrome.storage.sync.set({selectMode:"useCtrl"},function(){})}),showPositionSide.addEventListener("click",function(){chrome.storage.sync.set({showPosition:"side"},function(){})}),showPositionNear.addEventListener("click",function(){chrome.storage.sync.set({showPosition:"near"},function(){})}),toggleKey.onchange=function(){chrome.storage.sync.set({toggleKey:this.value},function(){})};
\ No newline at end of file
+function queryInPopup(a){$queryResultContainer.classList.contains("unshow")&&$queryResultContainer.classList.remove("unshow"),""!==$input.value&&($queryResultContainer.innerHTML="ψ(._. )>词典君正在翻译。。。"),a?($input.value=a,chrome.extension.sendMessage({queryWord:a,source:"popup"},buildResult)):chrome.extension.sendMessage({queryWord:$input.value,source:"popup"},buildResult)}function buildVoice(a){var b=a.getAttribute("data-src"),c=document.createElement("audio");c.setAttribute("src",b),a.appendChild(c),c.addEventListener("ended",function(){this.load()}),a.addEventListener("click",function(){c.play()})}function createLink(a,b){a.addEventListener("click",function(){chrome.tabs.create({url:b})})}function totalHeight(a){for(var b=document.getElementsByClassName(a),c=b.length,d=0,e=0;c>e;e++)d+=b[e].scrollHeight;return d+10}var $button=document.querySelector("#search"),$tipsContainer=document.querySelector("#tips"),$input=document.querySelector("#query-word"),$queryResultContainer=document.querySelector("#query-result");-1!==window.navigator.platform.toLowerCase().indexOf("mac")&&(document.querySelector("#ctrl-option").firstChild.nodeValue="Command"),$tipsContainer.classList.contains("unshow")||$tipsContainer.classList.add("unshow");var buildResult=function(a){var b=a,c="";if("query success"==b.validMessage){c+=b.titleBlock,void 0!==b.basicBlock&&(c+=b.basicBlock),void 0!==b.webBlock&&(c+=b.webBlock),$queryResultContainer.innerHTML=c;var d,e,f=document.querySelectorAll(".voice-container");for(d=0,e=f.length;e>d;d++)buildVoice(f[d])}else $queryResultContainer.innerHTML=20==b.errorCode?"这段文字太长，词典君无能为力了（┬_┬）
试试短一点的吧~
":40==b.errorCode?"对不起，这段文字太高深了，请饶过词典君吧（┬_┬）
":"词典君罢工啦（┬_┬）
是不是网络不太好？
稍后再试一次吧
"};$button.addEventListener("click",function(){queryInPopup()}),$input.select(),$input.addEventListener("input",function(){var a=$input.value;setTimeout(function(){$input.value===a&&""!==$input.value&&queryInPopup()},500)});var issue=document.querySelector("#issue"),email=document.querySelector("#email"),source=document.querySelector("#source"),keySet=document.querySelector("#key-set"),score=document.querySelector("#score");createLink(email,"mailto:ververcpp@gmail.com"),createLink(source,"https://github.com/ververcpp/ChaZD"),createLink(issue,"https://github.com/ververcpp/ChaZD/issues/new"),createLink(keySet,"chrome://extensions/configureCommands"),createLink(score,"https://chrome.google.com/webstore/detail/chazd/nkiipedegbhbjmajlhpegcpcaacbfggp"),document.querySelector("#setting-button").addEventListener("click",function(){var a=document.getElementById("settings");a.classList.toggle("active"),a.style.height=a.classList.contains("active")?blockHeight+"px":0});var blockHeight=totalHeight("top-menu")+totalHeight("sub-menu")+totalHeight("carved")+32,linkQuery=document.querySelector("#linkQuery"),noSelect=document.querySelector("#noSelect"),mouseSelect=document.querySelector("#mouseSelect"),useCtrl=document.querySelector("#useCtrl"),autoAudio=document.querySelector("#autoAudio"),defaultUk=document.querySelector("#defaultUk"),defaultUs=document.querySelector("#defaultUs"),showPositionSide=document.querySelector("#showPositionSide"),showPositionNear=document.querySelector("#showPositionNear"),autoHide=document.querySelector("#autoHide"),showDuration=document.querySelector("#showDuration"),currentDuration=document.querySelector("#currentDuration"),turnOffTips=document.querySelector("#turn-off-tips"),tips=document.querySelector("#tips"),toggleKey=document.querySelector("#toggle-key");chrome.storage.sync.get(null,function(a){""!==a.currentWord&&queryInPopup(a.currentWord),a.linkQuery===!0?(linkQuery.checked=!0,linkQuery.nextSibling.classList.remove("unactive")):(linkQuery.checked=!1,linkQuery.nextSibling.classList.add("unactive")),a.autoAudio===!0?(autoAudio.checked=!0,autoAudio.nextSibling.classList.remove("unactive")):(autoAudio.checked=!1,autoAudio.nextSibling.classList.add("unactive")),1===a.defaultVoice?(defaultUk.checked=!0,defaultUk.nextSibling.classList.remove("unactive"),defaultUs.nextSibling.classList.add("unactive")):2===a.defaultVoice&&(defaultUs.checked=!0,defaultUs.nextSibling.classList.remove("unactive"),defaultUk.nextSibling.classList.add("unactive")),"noSelect"===a.selectMode&&(noSelect.checked=!0,noSelect.nextSibling.classList.remove("unactive"),mouseSelect.nextSibling.classList.add("unactive"),useCtrl.nextSibling.classList.add("unactive"),toggleKey.disabled=!0,autoAudio.disabled=!0),"mouseSelect"===a.selectMode&&(mouseSelect.checked=!0,mouseSelect.nextSibling.classList.remove("unactive"),noSelect.nextSibling.classList.add("unactive"),useCtrl.nextSibling.classList.add("unactive"),toggleKey.disabled=!0,autoAudio.disabled=!1),"useCtrl"===a.selectMode&&(useCtrl.checked=!0,useCtrl.nextSibling.classList.remove("unactive"),noSelect.nextSibling.classList.add("unactive"),mouseSelect.nextSibling.classList.add("unactive"),toggleKey.disabled=!1,autoAudio.disabled=!1),a.showTips&&tips.classList.remove("unshow"),"side"===a.showPosition?(showPositionSide.checked=!0,showPositionSide.nextSibling.classList.remove("unactive"),showPositionNear.nextSibling.classList.add("unactive")):"near"===a.showPosition&&(showPositionNear.checked=!0,showPositionSide.nextSibling.classList.add("unactive"),showPositionNear.nextSibling.classList.remove("unactive")),"ctrl"===a.toggleKey?toggleKey.selectedIndex=0:"alt"===a.toggleKey?toggleKey.selectedIndex=1:"shift"===a.toggleKey&&(toggleKey.selectedIndex=2),a.autoHide===!0?(autoHide.checked=!0,autoHide.nextSibling.classList.remove("unactive"),showDuration.disabled=!1):(autoHide.checked=!1,autoHide.nextSibling.classList.add("unactive"),showDuration.disabled=!0),currentDuration.innerHTML=showDuration.value=a.showDuration}),linkQuery.addEventListener("click",function(){var a=linkQuery.checked;linkQuery.nextSibling.classList.toggle("unactive"),chrome.storage.sync.set({linkQuery:a},function(){})}),autoAudio.addEventListener("click",function(){var a=autoAudio.checked;a?autoAudio.nextSibling.classList.remove("unactive"):autoAudio.nextSibling.classList.add("unactive"),chrome.storage.sync.set({autoAudio:a},function(){})}),defaultUk.addEventListener("click",function(){defaultUk.nextSibling.classList.remove("unactive"),defaultUs.nextSibling.classList.add("unactive"),chrome.storage.sync.set({defaultVoice:1},function(){})}),defaultUs.addEventListener("click",function(){defaultUs.nextSibling.classList.remove("unactive"),defaultUk.nextSibling.classList.add("unactive"),chrome.storage.sync.set({defaultVoice:2},function(){})}),turnOffTips.addEventListener("click",function(){tips.classList.add("unshow"),chrome.storage.sync.set({showTips:!1},function(){})}),noSelect.addEventListener("click",function(){toggleKey.disabled=!0,autoAudio.disabled=!0,noSelect.nextSibling.classList.remove("unactive"),mouseSelect.nextSibling.classList.add("unactive"),useCtrl.nextSibling.classList.add("unactive"),chrome.storage.sync.set({selectMode:"noSelect"},function(){})}),mouseSelect.addEventListener("click",function(){toggleKey.disabled=!0,autoAudio.disabled=!1,noSelect.nextSibling.classList.add("unactive"),mouseSelect.nextSibling.classList.remove("unactive"),useCtrl.nextSibling.classList.add("unactive"),chrome.storage.sync.set({selectMode:"mouseSelect"},function(){})}),useCtrl.addEventListener("click",function(){toggleKey.disabled&&(toggleKey.disabled=!1),autoAudio.disabled=!1,noSelect.nextSibling.classList.add("unactive"),mouseSelect.nextSibling.classList.add("unactive"),useCtrl.nextSibling.classList.remove("unactive"),chrome.storage.sync.set({selectMode:"useCtrl"},function(){})}),showPositionSide.addEventListener("click",function(){showPositionSide.nextSibling.classList.remove("unactive"),showPositionNear.nextSibling.classList.add("unactive"),chrome.storage.sync.set({showPosition:"side"},function(){})}),showPositionNear.addEventListener("click",function(){showPositionSide.nextSibling.classList.add("unactive"),showPositionNear.nextSibling.classList.remove("unactive"),chrome.storage.sync.set({showPosition:"near"},function(){})}),autoHide.addEventListener("click",function(){var a=autoHide.checked;a?(autoHide.nextSibling.classList.remove("unactive"),showDuration.disabled=!1):(autoHide.nextSibling.classList.add("unactive"),showDuration.disabled=!0),chrome.storage.sync.set({autoHide:a},function(){})}),showDuration.addEventListener("input",function(){currentDuration.innerHTML=showDuration.value,chrome.storage.sync.set({showDuration:showDuration.value},function(){})}),toggleKey.onchange=function(){chrome.storage.sync.set({toggleKey:this.value},function(){})};
\ No newline at end of file
diff --git a/public/js/selection.min.js b/public/js/selection.min.js
index c0b74de..6e2d03b 100644
--- a/public/js/selection.min.js
+++ b/public/js/selection.min.js
@@ -1 +1 @@
-!function(){function a(a){var b=a.getAttribute("data-src"),c=document.createElement("audio");c.setAttribute("src",b),a.appendChild(c),m===!0&&c.play(),c.addEventListener("ended",function(){this.load()}),a.addEventListener("click",function(){c.play()})}function b(a,b){return a.top===b.top&&a.bottom===b.bottom&&a.left===b.left&&a.right===b.right?!0:!1}var c={top:0,bottom:0,left:0,right:0,again:0},d=function(a){var d=window.getSelection&&window.getSelection();if(d&&d.rangeCount>0){var g=trim(d.toString()),h=d.getRangeAt(0).getBoundingClientRect();if(b(h,c)&&c.again)return void(c.again=0);if(""===g||!/[a-zA-Z\s]/.test(g))return;chrome.storage.sync.set({currentWord:g},function(){});for(var i in c)c[i]="again"==i?1:h[i];var j={};chrome.storage.sync.get(null,function(b){for(var c in b)j[c]=b[c];"side"==j.showPosition&&e(g),"near"==j.showPosition&&f(g,h,a)})}},e=function(a){var b=h(a);b.classList.add("ChaZD-result-side"),document.documentElement.appendChild(b)},f=function(a,b,c){var d=h(a),e=g();document.documentElement.appendChild(d),document.documentElement.appendChild(e);var f={};0===b.left&&0===b.top&&(b={left:c.clientX,top:c.clientY,height:15});var i=d.offsetWidth,j=b.right-b.left,k=b.left+window.pageXOffset,l=b.top+window.pageYOffset,m=j/2+k,n=k-(i-j)/2,o=m-12;nwindow.pageXOffset+document.documentElement.clientWidth&&(n=window.pageXOffset+document.documentElement.clientWidth-i);var p=0;if(p=document.documentElement.clientHeight>document.body.clientHeight?document.body.clientHeight:document.documentElement.clientHeight,0===p&&(p=document.documentElement.clientHeight),b.top>=150){var q=p-l+10,r=q+1;f={left:n,bottom:q,arrowLeft:o,arrowBottom:r}}else f={left:n,top:l+b.height+12,arrowLeft:o,arrowTop:l+b.height+1};d.style.left=f.left+"px",e.style.left=f.arrowLeft+"px",f.bottom&&(d.style.bottom=f.bottom+"px",e.style.bottom=f.arrowBottom+"px",document.getElementById("ChaZD-arrow-outer").classList.add("ChaZD-arrow-outer-down"),document.getElementById("ChaZD-arrow-inner").classList.add("ChaZD-arrow-inner-down")),f.top&&(d.style.top=f.top+"px",e.style.top=f.arrowTop+"px",document.getElementById("ChaZD-arrow-outer").classList.add("ChaZD-arrow-outer-up"),document.getElementById("ChaZD-arrow-inner").classList.add("ChaZD-arrow-inner-up"))},g=function(){var a=document.createElement("div");a.classList.add("ChaZD-arrow-main");var b=document.createElement("div");b.setAttribute("id","ChaZD-arrow-outer");var c=document.createElement("div");return c.setAttribute("id","ChaZD-arrow-inner"),a.appendChild(b),a.appendChild(c),a},h=function(b){var c=document.createElement("div");c.classList.add("ChaZD-result-container"),c.setAttribute("data-text",b);var d=document.createElement("div");return d.setAttribute("id","ChaZD-searching"),d.innerHTML="ψ(._. )>划词君正在翻译。。。",c.appendChild(d),chrome.runtime.sendMessage({queryWord:b,source:"select"},function(b){var e=b;if(d.innerHTML="","query success"===e.validMessage){c.innerHTML=e.titleBlock;var f=c.querySelector(".voice-container");a(f);var g=document.createElement("div");e.basicBlock?(g.innerHTML=e.basicBlock,c.appendChild(g)):e.haveTranslation?c.querySelector(".title-translation").style.display="block":e.haveWebTranslation?(g.innerHTML=e.webBlock,c.appendChild(g),c.querySelector(".web-title").innerHTML="网络释义"):c.innerHTML="╮(╯▽╰)╭划词君无能为力啊
还是右键问问谷歌君吧=>"}else c.innerHTML=20==e.errorCode?"这段文字太长，词典君无能为力了（┬_┬）
试试短一点的吧~
":40==e.errorCode?"对不起，这段文字太高深了，请饶过词典君吧（┬_┬）
":"词典君罢工啦（┬_┬）
是不是网络不太好？
稍后再试一次吧
"}),c},i=!0,j=!1,k="ctrl",l=!1,m=!1;chrome.storage.sync.get(null,function(a){i="noSelect"===a.selectMode?!0:!1,j="useCtrl"===a.selectMode?!0:!1,k=a.toggleKey,l=a.linkQuery,m=a.autoAudio}),chrome.storage.onChanged.addListener(function(a){for(var b in a);if(void 0!==a.linkQuery&&(l=a.linkQuery.newValue),void 0!==a.autoAudio&&(m=a.autoAudio.newValue),void 0!==a.selectMode){var c=a.selectMode.newValue;i="noSelect"===c?!0:!1,j="useCtrl"===c?!0:!1}void 0!==a.toggleKey&&(k=a.toggleKey.newValue)});var n=["ChaZD-result-container","title-container","title-word","title-translation","basic-container","phonetic-container","explains-container","explains-container","explains-list","property-container","explains-item","voice-container","us-phonetic-container","uk-phonetic-container","web-explains-container","web-explains-list","web-key","explains-item-value","web-value"];document.documentElement.addEventListener("mousedown",function(a){for(var b in n)if(a.target.classList.contains(n[b]))return;var c=document.querySelector(".ChaZD-result-container"),d=document.querySelector(".ChaZD-arrow-main");c&&document.documentElement.removeChild(c),d&&document.documentElement.removeChild(d),chrome.storage.sync.set({currentWord:""}),u(a)}),window.addEventListener("resize",function(){var a=document.querySelector(".ChaZD-result-container"),b=document.querySelector(".ChaZD-arrow-main");a&&document.documentElement.removeChild(a),b&&document.documentElement.removeChild(b)});var o=function(a){if(!i){if(j)if("ctrl"===k){if(!a.ctrlKey&&!a.metaKey)return void(c.again=0)}else if("alt"===k){if(!a.altKey)return void(c.again=0)}else if("shift"===k&&!a.shiftKey)return void(c.again=0);d(a)}},p=null,q=function(a){l&&(a.stopPropagation(),p=this,a.shiftKey&&s(a))},r=function(a){l&&(a.stopPropagation(),p&&p.classList.contains("ChaZD-link")&&t(a,!0),p=null)},s=function(a){p&&a.shiftKey&&(p.setAttribute("ChaZD-href",p.getAttribute("href")),p.removeAttribute("href"),p.classList.add("ChaZD-link"))},t=function(a,b){p&&(b||16==a.keyCode)&&(p.setAttribute("href",p.getAttribute("ChaZD-href")),p.removeAttribute("ChaZD-href"),p.classList.remove("ChaZD-link"))},u=function(a){l&&0===a.button&&a.shiftKey&&window.getSelection().empty()};document.documentElement.addEventListener("mouseup",o);for(var v=document.querySelectorAll("a"),w=0,x=v.length;x>w;w++)v[w].addEventListener("mouseenter",q),v[w].addEventListener("mouseleave",r);document.documentElement.addEventListener("keydown",s),document.documentElement.addEventListener("keyup",t),document.documentElement.addEventListener("selectstart",o)}();
\ No newline at end of file
+!function(){function a(a){var b=a.getAttribute("data-src"),c=document.createElement("audio");c.setAttribute("src",b+"&type="+q),a.appendChild(c),n===!0&&c.play(),c.addEventListener("ended",function(){this.load()}),a.addEventListener("click",function(){c.play()})}function b(a,b){return a.top===b.top&&a.bottom===b.bottom&&a.left===b.left&&a.right===b.right?!0:!1}var c,d={top:0,bottom:0,left:0,right:0,again:0},e=function(a){var c=window.getSelection&&window.getSelection();if(c&&c.rangeCount>0){var e=trim(c.toString()),h=c.getRangeAt(0).getBoundingClientRect();if(b(h,d)&&d.again)return void(d.again=0);if(""===e||!/[a-zA-Z\s]/.test(e))return;chrome.storage.sync.set({currentWord:e},function(){});for(var i in d)d[i]="again"==i?1:h[i];var j={};chrome.storage.sync.get(null,function(b){for(var c in b)j[c]=b[c];"side"==j.showPosition&&f(e),"near"==j.showPosition&&g(e,h,a)})}},f=function(a){var b=i(a);b.classList.add("ChaZD-result-side"),document.documentElement.appendChild(b),o&&(c=setTimeout(function(){document.querySelector(".ChaZD-result-container")&&document.documentElement.removeChild(b)},1e3*p))},g=function(a,b,d){var e=i(a),f=h();document.documentElement.appendChild(e),document.documentElement.appendChild(f);var g={};0===b.left&&0===b.top&&(b={left:d.clientX,top:d.clientY,height:15});var j=e.offsetWidth,k=b.right-b.left,l=b.left+window.pageXOffset,m=b.top+window.pageYOffset,n=k/2+l,q=l-(j-k)/2,r=n-12;qwindow.pageXOffset+document.documentElement.clientWidth&&(q=window.pageXOffset+document.documentElement.clientWidth-j);var s=0;if(s=document.documentElement.clientHeight>document.body.clientHeight?document.body.clientHeight:document.documentElement.clientHeight,0===s&&(s=document.documentElement.clientHeight),b.top>=150){var t=s-m+10,u=t+1;g={left:q,bottom:t,arrowLeft:r,arrowBottom:u}}else g={left:q,top:m+b.height+12,arrowLeft:r,arrowTop:m+b.height+1};e.style.left=g.left+"px",f.style.left=g.arrowLeft+"px";var v,w,x=document.querySelectorAll(".ChaZD-arrow-outer"),y=document.querySelectorAll(".ChaZD-arrow-inner");if(g.bottom)for(e.style.bottom=g.bottom+"px",f.style.bottom=g.arrowBottom+"px",v=0,w=x.length;w>v;v++)x[v].classList.add("ChaZD-arrow-outer-down"),y[v].classList.add("ChaZD-arrow-inner-down");if(g.top)for(e.style.top=g.top+"px",f.style.top=g.arrowTop+"px",v=0,w=x.length;w>v;v++)x[v].classList.add("ChaZD-arrow-outer-up"),y[v].classList.add("ChaZD-arrow-inner-up");o&&(c=setTimeout(function(){document.querySelector(".ChaZD-result-container")&&document.querySelector(".ChaZD-arrow-main")&&(document.documentElement.removeChild(e),document.documentElement.removeChild(f))},1e3*p))},h=function(){var a=document.createElement("div");a.classList.add("ChaZD-arrow-main");var b=document.createElement("div");b.setAttribute("class","ChaZD-arrow-outer");var c=document.createElement("div");return c.setAttribute("class","ChaZD-arrow-inner"),a.appendChild(b),a.appendChild(c),a},i=function(b){var c=document.createElement("div");c.classList.add("ChaZD-result-container"),c.setAttribute("data-text",b);var d=document.createElement("div");return d.setAttribute("id","ChaZD-searching"),d.innerHTML="ψ(._. )>划词君正在翻译。。。",c.appendChild(d),chrome.runtime.sendMessage({queryWord:b,source:"select"},function(b){var e=b;if(d.innerHTML="","query success"===e.validMessage){c.innerHTML=e.titleBlock;var f=c.querySelector(".voice-container");a(f);var g=document.createElement("div");e.basicBlock?(g.innerHTML=e.basicBlock,c.appendChild(g)):e.haveTranslation?c.querySelector(".title-translation").style.display="block":e.haveWebTranslation?(g.innerHTML=e.webBlock,c.appendChild(g),c.querySelector(".web-title").innerHTML="网络释义"):c.innerHTML="╮(╯▽╰)╭划词君无能为力啊
还是右键问问谷歌君吧=>"}else c.innerHTML=20==e.errorCode?"这段文字太长，词典君无能为力了（┬_┬）
试试短一点的吧~
":40==e.errorCode?"对不起，这段文字太高深了，请饶过词典君吧（┬_┬）
":"词典君罢工啦（┬_┬）
是不是网络不太好？
稍后再试一次吧
"}),c},j=!0,k=!1,l="ctrl",m=!1,n=!1,o=!1,p=3,q=1;chrome.storage.sync.get(null,function(a){j="noSelect"===a.selectMode?!0:!1,k="useCtrl"===a.selectMode?!0:!1,l=a.toggleKey,m=a.linkQuery,n=a.autoAudio,o=a.autoHide,p=a.showDuration,q=a.defaultVoice}),chrome.storage.onChanged.addListener(function(a){if(void 0!==a.linkQuery&&(m=a.linkQuery.newValue),void 0!==a.autoAudio&&(n=a.autoAudio.newValue),void 0!==a.defaultVoice&&(q=a.defaultVoice.newValue),void 0!==a.selectMode){var b=a.selectMode.newValue;j="noSelect"===b?!0:!1,k="useCtrl"===b?!0:!1}void 0!==a.toggleKey&&(l=a.toggleKey.newValue),void 0!==a.autoHide&&(o=a.autoHide.newValue),void 0!==a.showDuration&&(p=a.showDuration.newValue)});var r=["ChaZD-result-container","title-container","title-word","title-translation","basic-container","phonetic-container","explains-container","explains-container","explains-list","property-container","explains-item","voice-container","us-phonetic-container","uk-phonetic-container","web-explains-container","web-explains-list","web-key","explains-item-value","web-value"];document.documentElement.addEventListener("mousedown",function(a){for(var b in r)if(a.target.classList.contains(r[b]))return;clearTimeout(c);var d,e,f=document.querySelectorAll(".ChaZD-result-container"),g=document.querySelectorAll(".ChaZD-arrow-main");if(f)for(d=0,e=f.length;e>d;d++)document.documentElement.removeChild(f[d]);if(g)for(d=0,e=g.length;e>d;d++)document.documentElement.removeChild(g[d]);chrome.storage.sync.set({currentWord:""})}),window.addEventListener("resize",function(){var a=document.querySelector(".ChaZD-result-container"),b=document.querySelector(".ChaZD-arrow-main");a&&document.documentElement.removeChild(a),b&&document.documentElement.removeChild(b)});var s=function(a){if(!j){if(k)if("ctrl"===l){if(!a.ctrlKey&&!a.metaKey)return void(d.again=0)}else if("alt"===l){if(!a.altKey)return void(d.again=0)}else if("shift"===l&&!a.shiftKey)return void(d.again=0);e(a)}},t=null,u=function(a){m&&(t=a.target,a.shiftKey&&w(a))},v=function(a){m&&(t&&t.classList.contains("ChaZD-link")&&x(a,!0),t=null)},w=function(a){t&&a.shiftKey&&(y(a),t.setAttribute("ChaZD-href",t.getAttribute("href")),t.removeAttribute("href"),t.classList.add("ChaZD-link"))},x=function(a,b){t&&(b||16==a.keyCode)&&(t.setAttribute("href",t.getAttribute("ChaZD-href")),t.removeAttribute("ChaZD-href"),t.classList.remove("ChaZD-link"))},y=function(a){m&&a.shiftKey&&window.getSelection().empty()};document.documentElement.addEventListener("mouseup",s),document.documentElement.addEventListener("mouseover",function(a){("A"===a.target.nodeName||"a"===a.target.nodeName)&&u(a)}),document.documentElement.addEventListener("mouseout",function(a){("A"===a.target.nodeName||"a"===a.target.nodeName)&&v(a)}),document.documentElement.addEventListener("keydown",w),document.documentElement.addEventListener("keyup",x),document.documentElement.addEventListener("selectstart",s)}();
\ No newline at end of file
diff --git a/public/js/utility.min.js b/public/js/utility.min.js
index 2015f88..03679bd 100644
--- a/public/js/utility.min.js
+++ b/public/js/utility.min.js
@@ -1 +1 @@
-function isEmpty(a){for(var b in a)return!1;return!0}function fmt(){var a=arguments;return a[0].replace(/#{(.*?)}/g,function(b,c){return function(a,b){var c=/\d+/.test(b[0])?parseInt(b[0]):b[0];return b.length>1?arguments.callee(a[c],b.slice(1)):a[c]}("object"==typeof a[1]?a[1]:a,c.split(/\.|\[|\]\[|\]\./))})}function trim(a){return a.replace(/(^\s*)|(\s*$)/g,"")}var api={key:1116151381,keyfrom:"youdaocidian"},urls={dict:"https://fanyi.youdao.com/openapi.do?keyfrom="+api.keyfrom+"&key="+api.key+"&type=data&doctype=json&version=1.1&q=",voice:"https://dict.youdao.com/dictvoice?audio="},settings={selectMode:"mouseSelect",showPosition:"near",toggleKey:"ctrl",showTips:!0,currentWord:"",linkQuery:!1,autoAudio:!1},frame={titleContainer:'#{1}#{2}
',titleWord:'#{1}#{2}
',voiceContainer:'',titleTranslation:'#{1}
',basicContainer:'#{1}#{2}
',phoneticContainer:'#{1}#{2}
',ukPhoneticContainer:'#{1}
',usPhoneticContainer:'#{1}
',explainsContainer:'#{1}
',explainsList:'',explain:'#{1}#{2}',propertyContainer:'#{2}',webExplainsContainer:'',webExplainsList:'',webExplain:'#{1}#{2}'};
\ No newline at end of file
+function isEmpty(a){for(var b in a)return!1;return!0}function fmt(){var a=arguments;return a[0].replace(/#{(.*?)}/g,function(b,c){return function(a,b){var c=/\d+/.test(b[0])?parseInt(b[0]):b[0];return b.length>1?arguments.callee(a[c],b.slice(1)):a[c]}("object"==typeof a[1]?a[1]:a,c.split(/\.|\[|\]\[|\]\./))})}function trim(a){return a.replace(/(^\s*)|(\s*$)/g,"")}var api={key:1116151381,keyfrom:"youdaocidian"},urls={dict:"https://fanyi.youdao.com/openapi.do?keyfrom="+api.keyfrom+"&key="+api.key+"&type=data&doctype=json&version=1.1&q=",voice:"https://dict.youdao.com/dictvoice?audio="},settings={selectMode:"mouseSelect",showPosition:"near",toggleKey:"ctrl",showTips:!0,currentWord:"",linkQuery:!1,autoAudio:!1,autoHide:!1,showDuration:3,defaultVoice:1},frame={titleContainer:'#{1}#{2}
',titleWord:'#{1}#{2}
',voiceContainer:'',titleTranslation:'#{1}
',basicContainer:'#{1}#{2}
',phoneticContainer:'#{1}#{2}
',ukPhoneticContainer:'#{1}
',usPhoneticContainer:'#{1}
',explainsContainer:'#{1}
',explainsList:'',explain:'#{1}#{2}',propertyContainer:'#{2}',webExplainsContainer:'',webExplainsList:'',webExplain:'#{1}#{2}'};
\ No newline at end of file
diff --git a/src/inPage.css b/src/inPage.css
index 6101e0b..6e30069 100644
--- a/src/inPage.css
+++ b/src/inPage.css
@@ -205,7 +205,7 @@
.ChaZD-arrow-main {
position: absolute;
- z-index: 999998;
+ z-index: 999997;
-webkit-animation: fade-in 0.3s ease;
-moz-animation: fade-in 0.3s ease;
-o-animation: fade-in 0.3s ease;
@@ -236,7 +236,6 @@
border-right: 10px solid transparent;
position: absolute;
left: 2px;
- z-index: 999999;
}
.ChaZD-arrow-inner-up {
diff --git a/src/inPage.css.map b/src/inPage.css.map
index 60b6528..00ebee2 100644
--- a/src/inPage.css.map
+++ b/src/inPage.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "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",
+"mappings": "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",
"sources": ["sass/inPage.scss"],
"names": [],
"file": "inPage.css"
diff --git a/src/javascript/background.js b/src/javascript/background.js
index f1525e0..374323e 100644
--- a/src/javascript/background.js
+++ b/src/javascript/background.js
@@ -9,8 +9,15 @@ function ChaZD(queryWord, wordSource, sendResponse) {
xhr.open("GET", url, true);
xhr.onreadystatechange = function() {
if (xhr.readyState != 4) {return;}
- var resultObj = self.parseResult.call(self, xhr.responseText);
- sendResponse(resultObj);
+ var result = JSON.parse(xhr.responseText);
+
+ if (queryWord.indexOf("-") !== -1 && !self.checkErrorCode(result.errorCode).error && !self.haveTranslation(result)) {
+ //优化使用连字符的词的查询结果
+ new ChaZD(queryWord.replace(/-/g, " "), wordSource, sendResponse);
+ } else {
+ var resultObj = self.parseResult.call(self, result);
+ sendResponse(resultObj);
+ }
};
xhr.send();
}
@@ -55,16 +62,15 @@ ChaZD.prototype.checkErrorCode = function (errorCode) {
return response;
};
-ChaZD.prototype.parseResult = function (responseText) {
+ChaZD.prototype.parseResult = function (result) {
//console.log("Response Text: \n" + responseText);
- var result = JSON.parse(responseText);
var resultObj = {};
var validResult = this.checkErrorCode(result.errorCode);
resultObj.haveWebTranslation = false;
if (!validResult.error) {
var title = this.initTitle(result);
resultObj.titleBlock = title.titleBlock;
- resultObj.haveTranslation = title.haveTranslation;
+ resultObj.haveTranslation = this.haveTranslation(result);
if (result.basic !== undefined) {
var basicBlock = this.parseBasicResult(result);
resultObj.basicBlock = basicBlock;
@@ -83,14 +89,26 @@ ChaZD.prototype.parseResult = function (responseText) {
return resultObj;
};
-ChaZD.prototype.initTitle = function (result) {
+ChaZD.prototype.haveTranslation = function (result) {
+ if (this.checkErrorCode(result.errorCode).error) {
+ return false;
+ }
var translation = result.translation;
var queryWord = result.query;
- //console.log("[ChaZD] queryWord: %s, translation: %s.", queryWord, translation.toString());
- var haveTranslation = true;
if (trim(queryWord.toLowerCase()) === trim(translation.toString().toLowerCase())) {
- haveTranslation = false;
+ return false;
}
+ return true;
+};
+
+ChaZD.prototype.initTitle = function (result) {
+ var translation = result.translation;
+ var queryWord = result.query;
+ //console.log("[ChaZD] queryWord: %s, translation: %s.", queryWord, translation.toString());
+ // var haveTranslation = true;
+ // if (trim(queryWord.toLowerCase()) === trim(translation.toString().toLowerCase())) {
+ // haveTranslation = false;
+ // }
var voiceContainer = this.initVoice(queryWord);
//console.log("word length:", queryWord.length);
@@ -104,7 +122,7 @@ ChaZD.prototype.initTitle = function (result) {
return {
titleBlock : fmt(frame.titleContainer, titleWord, titleTranslation, queryWord.length >=50 ? "long-text" : ""),
- haveTranslation : haveTranslation
+ //haveTranslation : haveTranslation
};
};
@@ -230,6 +248,17 @@ ChaZD.prototype.parseWebResult = function (result) {
return fmt(frame.webExplainsContainer, fmt(frame.webExplainsList, webExplainsContent));
};
+//字符串预处理，解析驼峰命名法和下划线命名法的单词、词组
+function preprocessWord (originWord) {
+ if (originWord.indexOf(" ") === -1) {
+ originWord = originWord.replace(/_/g, " ");
+ if (/[a-z]+/.test(originWord)) {
+ originWord = trim(originWord.replace(/([A-Z])/g, " $1"));
+ }
+ }
+ return originWord;
+}
+
/*
ChaZD.prototype.parsePhrase = function (queryWord, key) {
var words = [];
@@ -275,8 +304,8 @@ chrome.runtime.onInstalled.addListener(
//console.log("[ChaZD] update from version " + details.previousVersion);
//alert("New version has updated!");
showNotification({
- title : "ChaZD 更新到0.8.10版啦！",
- content : "新增划词自动发音功能，可以在设置中开启或关闭该功能；\n接口改用https协议；\n优化用户体验。"
+ title : "ChaZD 更新到0.8.15版！",
+ content : "修改 bug"
});
}
@@ -306,7 +335,7 @@ chrome.runtime.onMessage.addListener(
function (message, sender, sendResponse) {
//console.log("message from sender:" + JSON.stringify(message));
//console.log("sender is " + JSON.stringify(sender));
- new ChaZD(message.queryWord, message.source, sendResponse);
+ new ChaZD(preprocessWord(message.queryWord), message.source, sendResponse);
return true;
});
diff --git a/src/javascript/popup.js b/src/javascript/popup.js
index 63be2cc..d404386 100644
--- a/src/javascript/popup.js
+++ b/src/javascript/popup.js
@@ -65,25 +65,16 @@ $button.addEventListener("click", function (event) {
});
$input.select();
-// $input.addEventListener("keyup", function (event) {
-// if (event.keyCode === 13) {
-// queryInPopup();
-// }
-// });
$input.addEventListener("input", function (event) {
var currentInput = $input.value;
setTimeout(function () {
- if ($input.value === currentInput) {
+ if ($input.value === currentInput && $input.value !== "") {
queryInPopup();
}
}, 500);
});
-// $input.addEventListener("keydown", function (event) {
-// clearTimeout(t);
-// });
-
function buildVoice(voice) {
var src = voice.getAttribute("data-src");
//console.log("voice src: [] " + src);
@@ -139,16 +130,19 @@ function totalHeight(className) {
return sum + 10;
}
-var blockHeight = totalHeight("top-menu") + totalHeight("sub-menu") + totalHeight("carved") + 20;
+var blockHeight = totalHeight("top-menu") + totalHeight("sub-menu") + totalHeight("carved") + 32;
var linkQuery = document.querySelector("#linkQuery");
var noSelect = document.querySelector("#noSelect");
var mouseSelect = document.querySelector("#mouseSelect");
var useCtrl = document.querySelector("#useCtrl");
var autoAudio = document.querySelector("#autoAudio");
+var defaultUk = document.querySelector("#defaultUk");
+var defaultUs = document.querySelector("#defaultUs");
var showPositionSide = document.querySelector("#showPositionSide");
var showPositionNear = document.querySelector("#showPositionNear");
-//var showDuration = $("showDuration");
-//var currentDuration = $("currentDuration");
+var autoHide = document.querySelector("#autoHide");
+var showDuration = document.querySelector("#showDuration");
+var currentDuration = document.querySelector("#currentDuration");
var turnOffTips = document.querySelector("#turn-off-tips");
var tips = document.querySelector("#tips");
var toggleKey = document.querySelector("#toggle-key");
@@ -159,26 +153,51 @@ chrome.storage.sync.get(null, function (items) {
}
if(items.linkQuery === true) {
linkQuery.checked = true;
+ linkQuery.nextSibling.classList.remove("unactive");
} else {
linkQuery.checked = false;
+ linkQuery.nextSibling.classList.add("unactive");
}
if(items.autoAudio === true) {
autoAudio.checked = true;
+ autoAudio.nextSibling.classList.remove("unactive");
} else {
autoAudio.checked = false;
+ autoAudio.nextSibling.classList.add("unactive");
+ }
+ if(items.defaultVoice === 1) {
+ defaultUk.checked = true;
+ defaultUk.nextSibling.classList.remove("unactive");
+ defaultUs.nextSibling.classList.add("unactive");
+ } else if (items.defaultVoice === 2) {
+ defaultUs.checked = true;
+ defaultUs.nextSibling.classList.remove("unactive");
+ defaultUk.nextSibling.classList.add("unactive");
}
if (items.selectMode === "noSelect") {
noSelect.checked = true;
+ noSelect.nextSibling.classList.remove("unactive");
+ mouseSelect.nextSibling.classList.add("unactive");
+ useCtrl.nextSibling.classList.add("unactive");
+
toggleKey.disabled = true;
autoAudio.disabled = true;
}
if (items.selectMode === "mouseSelect") {
mouseSelect.checked = true;
+ mouseSelect.nextSibling.classList.remove("unactive");
+ noSelect.nextSibling.classList.add("unactive");
+ useCtrl.nextSibling.classList.add("unactive");
+
toggleKey.disabled = true;
autoAudio.disabled = false;
}
if (items.selectMode === "useCtrl") {
useCtrl.checked = true;
+ useCtrl.nextSibling.classList.remove("unactive");
+ noSelect.nextSibling.classList.add("unactive");
+ mouseSelect.nextSibling.classList.add("unactive");
+
toggleKey.disabled = false;
autoAudio.disabled = false;
}
@@ -187,8 +206,12 @@ chrome.storage.sync.get(null, function (items) {
}
if (items.showPosition === "side") {
showPositionSide.checked = true;
+ showPositionSide.nextSibling.classList.remove("unactive");
+ showPositionNear.nextSibling.classList.add("unactive");
} else if (items.showPosition === "near") {
showPositionNear.checked = true;
+ showPositionSide.nextSibling.classList.add("unactive");
+ showPositionNear.nextSibling.classList.remove("unactive");
}
if (items.toggleKey === "ctrl") {
toggleKey.selectedIndex = 0;
@@ -197,11 +220,21 @@ chrome.storage.sync.get(null, function (items) {
} else if (items.toggleKey === "shift") {
toggleKey.selectedIndex = 2;
}
- //currentDuration.innerHTML = showDuration.value = items["duration"];
+ if (items.autoHide === true) {
+ autoHide.checked = true;
+ autoHide.nextSibling.classList.remove("unactive");
+ showDuration.disabled = false;
+ } else {
+ autoHide.checked = false;
+ autoHide.nextSibling.classList.add("unactive");
+ showDuration.disabled = true;
+ }
+ currentDuration.innerHTML = showDuration.value = items.showDuration;
});
linkQuery.addEventListener("click", function (event) {
var currentLinkQuery = linkQuery.checked;
+ linkQuery.nextSibling.classList.toggle("unactive");
chrome.storage.sync.set({"linkQuery": currentLinkQuery}, function() {
//console.log("[ChaZD] Success update settings linkQuery = " + currentLinkQuery);
});
@@ -209,11 +242,32 @@ linkQuery.addEventListener("click", function (event) {
autoAudio.addEventListener("click", function (event) {
var currentAutoAudio = autoAudio.checked;
+ if (currentAutoAudio) {
+ autoAudio.nextSibling.classList.remove("unactive");
+ } else {
+ autoAudio.nextSibling.classList.add("unactive");
+ }
chrome.storage.sync.set({"autoAudio": currentAutoAudio}, function() {
//console.log("[ChaZD] Success update settings autoAudio = " + currentAutoAudio);
});
});
+defaultUk.addEventListener("click", function (event) {
+ defaultUk.nextSibling.classList.remove("unactive");
+ defaultUs.nextSibling.classList.add("unactive");
+ chrome.storage.sync.set({"defaultVoice": 1}, function() {
+ //console.log("[ChaZD] Success update settings defaultVoice = 1");
+ });
+});
+
+defaultUs.addEventListener("click", function (event) {
+ defaultUs.nextSibling.classList.remove("unactive");
+ defaultUk.nextSibling.classList.add("unactive");
+ chrome.storage.sync.set({"defaultVoice": 2}, function() {
+ //console.log("[ChaZD] Success update settings defaultVoice = 2");
+ });
+});
+
turnOffTips.addEventListener("click", function (event) {
tips.classList.add("unshow");
chrome.storage.sync.set({"showTips": false}, function() {
@@ -224,6 +278,10 @@ turnOffTips.addEventListener("click", function (event) {
noSelect.addEventListener("click", function (event) {
toggleKey.disabled = true;
autoAudio.disabled = true;
+
+ noSelect.nextSibling.classList.remove("unactive");
+ mouseSelect.nextSibling.classList.add("unactive");
+ useCtrl.nextSibling.classList.add("unactive");
chrome.storage.sync.set({"selectMode" : "noSelect"}, function() {
//console.log("[ChaZD] Success update settings selectMode = noSelect");
});
@@ -232,6 +290,10 @@ noSelect.addEventListener("click", function (event) {
mouseSelect.addEventListener("click", function (event) {
toggleKey.disabled = true;
autoAudio.disabled = false;
+
+ noSelect.nextSibling.classList.add("unactive");
+ mouseSelect.nextSibling.classList.remove("unactive");
+ useCtrl.nextSibling.classList.add("unactive");
chrome.storage.sync.set({"selectMode" : "mouseSelect"}, function() {
//console.log("[ChaZD] Success update settings selectMode = mouseSelect");
});
@@ -243,23 +305,51 @@ useCtrl.addEventListener("click", function (event) {
toggleKey.disabled = false;
}
autoAudio.disabled = false;
+ noSelect.nextSibling.classList.add("unactive");
+ mouseSelect.nextSibling.classList.add("unactive");
+ useCtrl.nextSibling.classList.remove("unactive");
chrome.storage.sync.set({"selectMode" : "useCtrl"}, function() {
//console.log("[ChaZD] Success update settings selectMode = useCtrl");
});
});
showPositionSide.addEventListener("click", function (event) {
+ showPositionSide.nextSibling.classList.remove("unactive");
+ showPositionNear.nextSibling.classList.add("unactive");
chrome.storage.sync.set({"showPosition" : "side"}, function() {
//console.log("[ChaZD] Success update settings showPosition = side");
});
});
showPositionNear.addEventListener("click", function (event) {
+ showPositionSide.nextSibling.classList.add("unactive");
+ showPositionNear.nextSibling.classList.remove("unactive");
chrome.storage.sync.set({"showPosition" : "near"}, function() {
//console.log("[ChaZD] Success update settings showPosition = near");
});
});
+autoHide.addEventListener("click", function (event) {
+ var currentAutoHide = autoHide.checked;
+ if (currentAutoHide) {
+ autoHide.nextSibling.classList.remove("unactive");
+ showDuration.disabled = false;
+ } else {
+ autoHide.nextSibling.classList.add("unactive");
+ showDuration.disabled = true;
+ }
+ chrome.storage.sync.set({"autoHide" : currentAutoHide}, function() {
+ //console.log("[ChaZD] Success update settings showPosition = near");
+ });
+});
+
+showDuration.addEventListener("input", function (event) {
+ currentDuration.innerHTML = showDuration.value;
+ chrome.storage.sync.set({"showDuration" : showDuration.value}, function() {
+ //console.log("[ChaZD] Success update settings toggleKey = " + this.value);
+ });
+});
+
toggleKey.onchange = function (event) {
chrome.storage.sync.set({"toggleKey" : this.value}, function() {
//console.log("[ChaZD] Success update settings toggleKey = " + this.value);
diff --git a/src/javascript/selection.js b/src/javascript/selection.js
index 106ec27..a129418 100644
--- a/src/javascript/selection.js
+++ b/src/javascript/selection.js
@@ -50,11 +50,21 @@
}
};
+ var timeout;
+
var showResultSide = function (text) {
//if(isExist(text)) return;
var $resultSideContainer = makeResultContainer(text);
$resultSideContainer.classList.add("ChaZD-result-side");
document.documentElement.appendChild($resultSideContainer);
+
+ if (autoHide) {
+ timeout = setTimeout(function () {
+ if (document.querySelector(".ChaZD-result-container")) {
+ document.documentElement.removeChild($resultSideContainer);
+ }
+ }, 1000 * showDuration);
+ }
};
var showResultNear = function (text, range, event) {
@@ -120,20 +130,34 @@
//resultNearContainer.style.position = "absolute";
resultNearContainer.style.left = showNearPosition.left + "px";
arrowMain.style.left = showNearPosition.arrowLeft + "px";
+ var chazdArrowOuter = document.querySelectorAll(".ChaZD-arrow-outer");
+ var chazdArrowInner = document.querySelectorAll(".ChaZD-arrow-inner");
+ var i, len;
if (showNearPosition.bottom) {
resultNearContainer.style.bottom = showNearPosition.bottom + "px";
arrowMain.style.bottom = showNearPosition.arrowBottom + "px";
- document.getElementById("ChaZD-arrow-outer").classList.add("ChaZD-arrow-outer-down");
- document.getElementById("ChaZD-arrow-inner").classList.add("ChaZD-arrow-inner-down");
+ for (i = 0, len = chazdArrowOuter.length; i < len; i++) {
+ chazdArrowOuter[i].classList.add("ChaZD-arrow-outer-down");
+ chazdArrowInner[i].classList.add("ChaZD-arrow-inner-down");
+ }
}
if (showNearPosition.top) {
resultNearContainer.style.top = showNearPosition.top + "px";
arrowMain.style.top = showNearPosition.arrowTop + "px";
- document.getElementById("ChaZD-arrow-outer").classList.add("ChaZD-arrow-outer-up");
- document.getElementById("ChaZD-arrow-inner").classList.add("ChaZD-arrow-inner-up");
+ for (i = 0, len = chazdArrowOuter.length; i < len; i++) {
+ chazdArrowOuter[i].classList.add("ChaZD-arrow-outer-up");
+ chazdArrowInner[i].classList.add("ChaZD-arrow-inner-up");
+ }
}
-
+ if (autoHide) {
+ timeout = setTimeout(function () {
+ if (document.querySelector(".ChaZD-result-container") && document.querySelector(".ChaZD-arrow-main")) {
+ document.documentElement.removeChild(resultNearContainer);
+ document.documentElement.removeChild(arrowMain);
+ }
+ }, 1000 * showDuration);
+ }
// var t = setTimeout(function () {
// document.body.removeChild(resultNearContainer);
// }, 1000 * duration);
@@ -145,9 +169,9 @@
var arrowDivMain = document.createElement("div");
arrowDivMain.classList.add("ChaZD-arrow-main");
var arrowDivOuter = document.createElement("div");
- arrowDivOuter.setAttribute("id", "ChaZD-arrow-outer");
+ arrowDivOuter.setAttribute("class", "ChaZD-arrow-outer");
var arrowDivInner = document.createElement("div");
- arrowDivInner.setAttribute("id", "ChaZD-arrow-inner");
+ arrowDivInner.setAttribute("class", "ChaZD-arrow-inner");
arrowDivMain.appendChild(arrowDivOuter);
arrowDivMain.appendChild(arrowDivInner);
@@ -210,7 +234,7 @@
var src = voice.getAttribute("data-src");
//console.log("voice src: [] " + src);
var audioBlock = document.createElement("audio");
- audioBlock.setAttribute("src", src);
+ audioBlock.setAttribute("src", src + "&type=" + defaultVoice);
//audioBlock.setAttribute("ended", "this.load()");
voice.appendChild(audioBlock);
if (autoAudio === true) {
@@ -241,24 +265,33 @@
var toggleKey = "ctrl";
var linkQuery = false;
var autoAudio = false;
+ var autoHide = false;
+ var showDuration = 3;
+ var defaultVoice = 1;
chrome.storage.sync.get(null, function(items) {
noSelect = (items.selectMode === "noSelect") ? true : false;
useCtrl = (items.selectMode === "useCtrl") ? true : false;
toggleKey = items.toggleKey;
linkQuery = items.linkQuery;
autoAudio = items.autoAudio;
+ autoHide = items.autoHide;
+ showDuration = items.showDuration;
+ defaultVoice = items.defaultVoice;
});
chrome.storage.onChanged.addListener(function(changes) {
- for (var key in changes) {
- //console.log("[ChaZD]Settings Update, [%s] %s => %s", key, changes[key].oldValue, changes[key].newValue);
- }
+ // for (var key in changes) {
+ // console.log("[ChaZD]Settings Update, [%s] %s => %s", key, changes[key].oldValue, changes[key].newValue);
+ // }
if (changes.linkQuery !== undefined) {
linkQuery = changes.linkQuery.newValue;
}
if (changes.autoAudio !== undefined) {
autoAudio = changes.autoAudio.newValue;
}
+ if (changes.defaultVoice !== undefined) {
+ defaultVoice = changes.defaultVoice.newValue;
+ }
if (changes.selectMode !== undefined) {
var selectMode = changes.selectMode.newValue;
noSelect = (selectMode === "noSelect") ? true : false;
@@ -267,6 +300,12 @@
if (changes.toggleKey !== undefined) {
toggleKey = changes.toggleKey.newValue;
}
+ if (changes.autoHide !== undefined) {
+ autoHide = changes.autoHide.newValue;
+ }
+ if (changes.showDuration !== undefined) {
+ showDuration = changes.showDuration.newValue;
+ }
});
var classNameCollection = ["ChaZD-result-container", "title-container", "title-word", "title-translation", "basic-container", "phonetic-container", "explains-container", "explains-container", "explains-list", "property-container", "explains-item", "voice-container", "us-phonetic-container", "uk-phonetic-container", "web-explains-container", "web-explains-list", "web-key", "explains-item-value", "web-value"];
@@ -283,16 +322,22 @@
// for (var i = 0; i < existResult.length; i++) {
// existResult[i].parentNode.removeChild(existResult[i]);
// }
- var chazdResult = document.querySelector(".ChaZD-result-container");
- var chazdArrow = document.querySelector(".ChaZD-arrow-main");
+ clearTimeout(timeout);
+ var chazdResult = document.querySelectorAll(".ChaZD-result-container");
+ var chazdArrow = document.querySelectorAll(".ChaZD-arrow-main");
+ var i, len;
if (chazdResult) {
- document.documentElement.removeChild(chazdResult);
+ for (i = 0, len = chazdResult.length; i < len; i++) {
+ document.documentElement.removeChild(chazdResult[i]);
+ }
}
if (chazdArrow) {
- document.documentElement.removeChild(chazdArrow);
+ for (i = 0, len = chazdArrow.length; i < len; i++) {
+ document.documentElement.removeChild(chazdArrow[i]);
+ }
}
chrome.storage.sync.set({"currentWord" : ""});
- clearSelection(event);
+ //clearSelection(event);
});
window.addEventListener("resize", function(event) {
@@ -347,9 +392,12 @@
var focusLink = function (event) {
if (linkQuery) {
- event.stopPropagation();
- link = this;
+ //event.stopPropagation();
+ //console.log("focusLink");
+ link = event.target;
+ //console.log(link);
if(event.shiftKey) {
+ // alert("have shift");
disableLink(event);
}
@@ -358,7 +406,7 @@
var blurLink = function (event) {
if (linkQuery) {
- event.stopPropagation();
+ //event.stopPropagation();
if (link && link.classList.contains("ChaZD-link")) {
enableLink(event, true);
}
@@ -368,6 +416,7 @@
var disableLink = function (event) {
if (link && event.shiftKey) {
+ clearSelection(event);
link.setAttribute("ChaZD-href", link.getAttribute("href"));
link.removeAttribute("href");
link.classList.add("ChaZD-link");
@@ -383,17 +432,30 @@
};
var clearSelection = function (event) {
- if (linkQuery && event.button === 0 && event.shiftKey) {
+ if (linkQuery && event.shiftKey) {
window.getSelection().empty();
}
};
document.documentElement.addEventListener("mouseup", queryEvent);
- var links = document.querySelectorAll("a");
- for (var i = 0, len = links.length; i < len; i++) {
- links[i].addEventListener("mouseenter", focusLink);
- links[i].addEventListener("mouseleave", blurLink);
- }
+ document.documentElement.addEventListener("mouseover", function (e) {
+ if (e.target.nodeName === "A" || e.target.nodeName === "a") {
+ focusLink(e);
+ }
+ });
+ document.documentElement.addEventListener("mouseout", function (e) {
+ if (e.target.nodeName === "A" || e.target.nodeName === "a") {
+ blurLink(e);
+ }
+ });
+ // var links = document.querySelectorAll("a");
+ // console.log(links);
+ // for (var i = 0, len = links.length; i < len; i++) {
+ // links[i].addEventListener("mouseover", function (e) {
+ // console.log("heloo world");
+ // });
+ // //links[i].addEventListener("mouseleave", blurLink);
+ // }
document.documentElement.addEventListener("keydown", disableLink);
document.documentElement.addEventListener("keyup", enableLink);
document.documentElement.addEventListener("selectstart", queryEvent); //bug!!
diff --git a/src/javascript/utility.js b/src/javascript/utility.js
index 7d6bb00..7a754e4 100644
--- a/src/javascript/utility.js
+++ b/src/javascript/utility.js
@@ -17,6 +17,9 @@ var settings = {
currentWord: "", //当前划词查询的内容
linkQuery: false, //在链接上划词
autoAudio: false, //划词自动发音
+ autoHide: false, //自动隐藏翻译结果
+ showDuration: 3, //翻译结果显示持续时间
+ defaultVoice: 1, //划词默认发音：1--英音；2--美音
};
var frame = {
diff --git a/src/sass/inPage.scss b/src/sass/inPage.scss
index 50211b9..2455aa2 100644
--- a/src/sass/inPage.scss
+++ b/src/sass/inPage.scss
@@ -209,7 +209,7 @@ $gap: 10px;
.ChaZD-arrow-main {
position: absolute;
- z-index: 999998;
+ z-index: 999997;
@include animation("fade-in 0.3s ease");
}
@@ -237,7 +237,7 @@ $gap: 10px;
border-right: 10px solid transparent;
position: absolute;
left: 2px;
- z-index: 999999;
+ // z-index: 999999;
}
.ChaZD-arrow-inner-up {
diff --git a/src/style.css b/src/style.css
index 743ddf9..f39360a 100644
--- a/src/style.css
+++ b/src/style.css
@@ -385,7 +385,7 @@ footer img {
.link {
cursor: pointer;
text-decoration: none;
- color: rgba(0, 0, 0, 0.2);
+ color: rgba(0, 0, 0, 0.6);
opacity: 0.5;
}
@@ -447,6 +447,7 @@ footer img {
max-height: 0;
height: 0;
overflow-y: hidden;
+ color: #6e665e;
transition: all .5s cubic-bezier(0, 1, 0.5, 1);
-webkit-transition: all .5s cubic-bezier(0, 1, 0.5, 1);
}
@@ -489,10 +490,33 @@ footer img {
margin-left: 5px;
}
+.setting-block label.unactive {
+ color: rgba(0, 0, 0, 0.5);
+}
+
.setting-block input {
margin: 0;
}
+.setting-block .sub-title {
+ margin-left: 17px;
+ font-size: 90%;
+}
+
+.setting-block .sub-button {
+ margin-left: 5px;
+}
+
+.setting-block .sub-label{
+ font-size: 90%;
+}
+
+#currentDuration {
+ display: inline-block;
+ width: 14px;
+ text-align: center;
+}
+
input[type="range"] {
width: 100px;
position: relative;