diff --git a/README.md b/README.md
index bbda2f1..6b01538 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,12 @@ ChaZD 查字典,简洁易用的英汉字典扩展程序,支持划词哦:)
更新日志
-------
+###ver 0.8.4
++ 优化了长文本的显示
++ 查词窗口更简洁
++ 同步了划词与弹出窗口的查询结果,想看更详细的翻译结果,划词后直接打开查词窗口就可以啦,还可以配合快捷键使用哦~
++ 使用shift键辅助,对之前无法划词的链接进行划词
+
###ver 0.8.3
+ 修改若干个BUG
+ 新的划词显示窗口
diff --git a/TODO.md b/TODO.md
index 9a5bfee..b620155 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,6 +5,7 @@ TODO LIST
2. 在划词结果中显示音标(如果有的话)
3. 在划词结果中支持发音
4. 改进划词结果显示的效果,整合jQuery
-5. 借鉴TransIt,针对链接的划词进行优化
+5. 借鉴TransIt,针对链接的划词进行优化
6. 准备引入英英翻译的功能,暂定为选用merriam-webster的API
-7. ...
\ No newline at end of file
+7. 设计一个新的插件图标
+8. 修改popup页面的显示布局,使其更简洁
\ No newline at end of file
diff --git a/background.js b/background.js
index d44c6c2..1a10398 100644
--- a/background.js
+++ b/background.js
@@ -1,4 +1,5 @@
-function ChaZD(queryWord, sendResponse) {
+function ChaZD(queryWord, wordSource, sendResponse) {
+ this.wordSource = wordSource;
var url = urls.dict + queryWord;
console.log("Query url: " + url);
var queryResult = {};
@@ -17,7 +18,8 @@ function ChaZD(queryWord, sendResponse) {
ChaZD.prototype.checkErrorCode = function (errorCode) {
var response = {
"message": "",
- "error": 0
+ "error": 0,
+ "errorCode": 0
};
switch (errorCode) {
case 0:
@@ -26,22 +28,27 @@ ChaZD.prototype.checkErrorCode = function (errorCode) {
case 20:
response["message"] = "要翻译的文本过长";
response["error"] = 1;
+ response["errorCode"] = 20;
break;
case 30:
response["message"] = "无法进行有效的翻译";
response["error"] = 1;
+ response["errorCode"] = 30;
break;
case 40:
response["message"] = "不支持的语言类型";
response["error"] = 1;
+ response["errorCode"] = 40;
break;
case 50:
response["message"] = "无效的key";
response["error"] = 1;
+ response["errorCode"] = 50;
break;
case 60:
response["message"] = "无辞典结果";
response["error"] = 1;
+ response["errorCode"] = 60;
break;
default:
}
@@ -68,8 +75,11 @@ ChaZD.prototype.parseResult = function (responseText) {
resultObj.haveWebTranslation = true;
resultObj.webBlock = webBlock;
}
+ } else {
+ resultObj.errorCode = validResult["errorCode"];
}
resultObj.validMessage = validResult["message"];
+
return resultObj;
}
@@ -82,15 +92,25 @@ ChaZD.prototype.initTitle = function (result) {
haveTranslation = false;
var voiceContainer = this.initVoice(queryWord);
+ console.log("word length:", queryWord.length);
+ console.log("word source:", this.wordSource);
+ queryWord = queryWord.length >= 50 && this.wordSource == "select" ? this.shortWord(queryWord) : queryWord;
+
+ console.log("word:", queryWord);
var titleWord = fmt(frames.titleWord, queryWord, voiceContainer);
var titleTranslation = fmt(frames.titleTranslation, translation.toString());
+
return {
- titleBlock : fmt(frames.titleContainer, titleWord, titleTranslation),
+ titleBlock : fmt(frames.titleContainer, titleWord, titleTranslation, queryWord.length >=50 ? "long-text" : ""),
haveTranslation : haveTranslation
};
}
+ChaZD.prototype.shortWord = function (longWord) {
+ return longWord.slice(0, longWord.lastIndexOf(" ", 50)).concat(" ...");
+}
+
ChaZD.prototype.parseBasicResult = function (result) {
var basic = result["basic"];
var queryWord = result["query"];
@@ -253,8 +273,9 @@ chrome.runtime.onInstalled.addListener(
console.log("[ChaZD] update from version " + details.previousVersion);
//alert("New version has updated!");
showNotification({
- title : "ChaZD 更新到0.8.3版啦!",
- content : "又发现了一个bug,赶紧修改了一下,以及新的划词显示效果~ 新增划词结果发音功能!" +
+ title : "ChaZD 更新到0.8.4版啦!",
+ content : "优化了长文本的显示;简化了按钮窗口;同步了划词与弹出窗口的查询结果;使用shift键辅助,对之前无法划词的链接进行划词..." +
+ "更多更新内容点击查看更新日志~" +
"感谢大家的支持,下个正式版本会添加更多新的功能,敬请期待:)"
})
}
@@ -267,7 +288,7 @@ chrome.storage.sync.get(null,function (items) {
console.log("storage 是空的");
chrome.storage.sync.set(settings);
} else {
- console.log("[ChaZD][Current Settings]")
+ console.log("[ChaZD][Current Settings]");
for (var key in items) {
if (settings[key] === undefined) {
chrome.storage.sync.remove(key);
@@ -284,7 +305,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, sendResponse);
+ new ChaZD(message.queryWord, message.source, sendResponse);
return true;
});
diff --git a/manifest.json b/manifest.json
index 6558a34..6d26f44 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "ChaZD",
- "version": "0.8.3",
+ "version": "0.8.4",
"description": "ChaZD 查字典,简洁易用的英汉字典扩展程序,支持划词哦:)",
"permissions": [
diff --git a/popup.html b/popup.html
index 3334666..099a644 100644
--- a/popup.html
+++ b/popup.html
@@ -7,7 +7,7 @@
+
+
diff --git a/popup.js b/popup.js
index 025747a..7ec5a9d 100644
--- a/popup.js
+++ b/popup.js
@@ -6,49 +6,66 @@ var $queryResultContainer = $("#query-result");
if (-1 !== window.navigator.platform.toLowerCase().indexOf("mac")) {
$("#ctrl-option").html("Command");
}
+if (!$tipsContainer.hasClass("unshow")){
+ $tipsContainer.addClass("unshow");
+}
+
-function queryInPopup() {
- if (!$tipsContainer.hasClass("unshow"))
- $tipsContainer.addClass("unshow");
+function queryInPopup(queryText) {
$input.select();
- if ($queryResultContainer.hasClass("unshow"))
+ if ($queryResultContainer.hasClass("unshow")){
$queryResultContainer.removeClass("unshow");
+ }
$queryResultContainer.html("ψ(._. )>词典君正在翻译。。。");
console.log("input value: " + $input.val());
- chrome.extension.sendMessage({queryWord: $input.val()}, function (response) {
- //alert("response from xhr: " + JSON.stringify(response));
- var resultObj = response;
- var resultBlock = "";
- if (resultObj.validMessage == "query success") {
- resultBlock += resultObj.titleBlock;
- if (resultObj.basicBlock !== undefined) {
- resultBlock += resultObj.basicBlock;
- }
- if (resultObj.webBlock !== undefined) {
- resultBlock += resultObj.webBlock;
- }
- $queryResultContainer.html(resultBlock);
- var voiceCollection = $(".voice-container");
- //console.log("voiceCollection length: " + voiceCollection.length);
- voiceCollection.each(function(index, el) {
- var src = $(this).attr("data-src");
- //console.log(src);
- var audioBlock = document.createElement("audio");
- audioBlock.setAttribute("src", src);
- //$.get();
- audioBlock.addEventListener("ended", function (event) {
- this.load();
- })
- $(this).click(function (event) {
- audioBlock.play();
- })
- });
- } else {
- $queryResultContainer.html(resultObj.validMessage + "
词典君崩溃了(┬-┬)");
- }
- });
+ console.log("quertText: " + queryText);
+ if (queryText) {
+ $input.val(queryText);
+ chrome.extension.sendMessage({queryWord: queryText, source: "popup"}, buildResult);
+ }
+ else
+ chrome.extension.sendMessage({queryWord: $input.val(), source: "popup"}, buildResult);
}
+var buildResult = function(response) {
+ //alert("response from xhr: " + JSON.stringify(response));
+ var resultObj = response;
+ var resultBlock = "";
+ if (resultObj.validMessage == "query success") {
+ resultBlock += resultObj.titleBlock;
+ if (resultObj.basicBlock !== undefined) {
+ resultBlock += resultObj.basicBlock;
+ }
+ if (resultObj.webBlock !== undefined) {
+ resultBlock += resultObj.webBlock;
+ }
+ $queryResultContainer.html(resultBlock);
+ var voiceCollection = $(".voice-container");
+ //console.log("voiceCollection length: " + voiceCollection.length);
+ voiceCollection.each(function(index, el) {
+ var src = $(this).attr("data-src");
+ //console.log(src);
+ var audioBlock = document.createElement("audio");
+ audioBlock.setAttribute("src", src);
+ //$.get();
+ audioBlock.addEventListener("ended", function (event) {
+ this.load();
+ })
+ $(this).click(function (event) {
+ audioBlock.play();
+ })
+ });
+ } else {
+ if (resultObj.errorCode == 20) {
+ $queryResultContainer.html("
这段文字太长,词典君无能为力了(┬_┬)
试试短一点的吧~
");
+ } else if (resultObj.errorCode == 40) {
+ $queryResultContainer.html("
对不起,这段文字太高深了,请饶过词典君吧(┬_┬)
");
+ } else {
+ $queryResultContainer.html("
词典君罢工啦(┬_┬)
是不是网络不太好?
稍后再试一次吧
");
+ }
+ }
+};
+
$button.click(function (event) {
queryInPopup();
});
@@ -87,6 +104,7 @@ $("#setting-button").click(function (event) {
}
});
+var linkQuery = $("#linkQuery");
var mouseSelect = $("#mouseSelect");
var useCtrl = $("#useCtrl");
var showPositionSide = $("#showPositionSide");
@@ -98,6 +116,14 @@ var tips = $("#tips");
var toggleKey = $("#toggle-key");
chrome.storage.sync.get(null, function (items) {
+ if(items.currentWord !== "") {
+ queryInPopup(items.currentWord);
+ }
+ if(items.linkQuery === true) {
+ linkQuery.attr("checked", true);
+ } else {
+ linkQuery.attr("checked", false);
+ }
if (items.selectMode === "mouseSelect") {
mouseSelect.attr("checked", true);
toggleKey.prop('disabled', 'disabled');
@@ -124,12 +150,19 @@ chrome.storage.sync.get(null, function (items) {
//currentDuration.innerHTML = showDuration.value = items["duration"];
});
+linkQuery.click(function (event) {
+ var currentLinkQuery = $("#linkQuery:checked").length > 0;
+ chrome.storage.sync.set({"linkQuery": currentLinkQuery}, function() {
+ console.log("[ChaZD] Success update settings linkQuery = " + currentLinkQuery);
+ });
+});
+
turnOffTips.click(function (event) {
tips.addClass("unshow");
chrome.storage.sync.set({"showTips": false}, function() {
console.log("[ChaZD] Success update settings showTips = false");
});
-})
+});
mouseSelect.click(function (event) {
toggleKey.prop('disabled', 'disabled');
diff --git a/selection.js b/selection.js
index 26251eb..d397a0d 100644
--- a/selection.js
+++ b/selection.js
@@ -15,7 +15,11 @@
preSelection.again = 0;
return;
}
+
if (selectText == "" || !(/[a-zA-Z\s]/.test(selectText))) return;
+ chrome.storage.sync.set({"currentWord" : selectText}, function() {
+ console.log("[ChaZD] Success update settings currentWord = " + selectText);
+ });
for (var key in preSelection) {
if (key == "again")
preSelection[key] = 1;
@@ -149,7 +153,8 @@
var $searchingNode = $("
ψ(._. )>划词君正在翻译。。。
")
$resultContainer.append($searchingNode);
chrome.runtime.sendMessage({
- queryWord: text
+ queryWord: text,
+ source: "select"
}, function(response) {
var resultObj = response;
$resultContainer.find("#ChaZD-searching").html("");
@@ -178,6 +183,14 @@
} else {
$resultContainer.append("╮(╯▽╰)╭划词君无能为力啊
复制给词典君试试吧↗");
}
+ } else {
+ if (resultObj.errorCode == 20) {
+ $resultContainer.append("
这段文字太长,词典君无能为力了(┬_┬)
试试短一点的吧~
");
+ } else if (resultObj.errorCode == 40) {
+ $resultContainer.append("
对不起,这段文字太高深了,请饶过词典君吧(┬_┬)
");
+ } else {
+ $resultContainer.append("
词典君罢工啦(┬_┬)
是不是网络不太好?
稍后再试一次吧
");
+ }
}
});
@@ -195,15 +208,20 @@
var useCtrl = true;
var toggleKey = "ctrl";
+ var linkQuery = false;
chrome.storage.sync.get(null, function(items) {
useCtrl = (items["selectMode"] === "useCtrl") ? true : false;
toggleKey = items["toggleKey"];
+ linkQuery = items["linkQuery"];
});
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);
}
+ if (changes["linkQuery"] !== undefined) {
+ linkQuery = changes["linkQuery"].newValue;
+ }
if (changes["selectMode"] !== undefined) {
var selectMode = changes["selectMode"].newValue;
useCtrl = (selectMode === "useCtrl") ? true : false;
@@ -229,6 +247,8 @@
// }
$(".ChaZD-result-container").remove();
$(".ChaZD-arrow-main").remove();
+ chrome.storage.sync.set({"currentWord" : ""});
+ clearSelection(event);
});
$(window).bind("resize", function(event) {
@@ -266,8 +286,50 @@
queryInPage(event);
}
- $(document).bind("mouseup", queryEvent);
+ var $link = null;
+
+ var focusLink = function (event) {
+ if (linkQuery) {
+ event.stopPropagation();
+ $link = $(this);
+ event.shiftKey && disableLink(event);
+
+ }
+ }
+
+ var blurLink = function (event) {
+ if (linkQuery) {
+ event.stopPropagation();
+ if ($link && $link.hasClass("ChaZD-link")) {
+ enableLink(event, true);
+ }
+ $link = null;
+ }
+ }
+
+ var disableLink = function (event) {
+ if ($link && event.shiftKey) {
+ $link.data("ChaZD-href", $link.attr("href")).removeAttr("href").addClass("ChaZD-link");
+ }
+ }
+ var enableLink = function (event, ignoreKey) {
+ if ($link && (ignoreKey || event.keyCode == 16)) {
+ $link.attr("href", $link.data("ChaZD-href")).removeClass("ChaZD-link");
+ }
+ }
+
+ var clearSelection = function (event) {
+ if (linkQuery && event.button == 0 && event.shiftKey) {
+ window.getSelection().empty();
+ }
+ }
+
+ $(document).bind("mouseup", queryEvent);
+ $(document).on("mouseenter", "a", focusLink);
+ $(document).on("mouseleave", "a", blurLink);
+ $(document).on("keydown", disableLink);
+ $(document).on("keyup", enableLink);
$(document).bind("selectstart", queryEvent); //bug!!
})();
\ No newline at end of file
diff --git a/style/inPage.css b/style/inPage.css
index f7b075f..094638c 100644
--- a/style/inPage.css
+++ b/style/inPage.css
@@ -144,6 +144,10 @@
.ChaZD-arrow-inner-down {
border-top: 10px solid #ffffdd; }
+a.ChaZD-link {
+ text-decoration: none !important;
+ cursor: text !important; }
+
/*
.ChaZD-result-container .voice-container::after {
content: '\E803';
diff --git a/style/inPage.css.map b/style/inPage.css.map
index 79fbea3..ad96635 100644
--- a/style/inPage.css.map
+++ b/style/inPage.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "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",
+"mappings": "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",
"sources": ["inPage.scss"],
"names": [],
"file": "inPage.css"
diff --git a/style/inPage.scss b/style/inPage.scss
index bfbcdfb..8164048 100644
--- a/style/inPage.scss
+++ b/style/inPage.scss
@@ -211,6 +211,10 @@ $gap: 10px;
border-top: 10px solid $background-color;
}
+a.ChaZD-link {
+ text-decoration: none !important;
+ cursor: text !important;
+}
/*
.ChaZD-result-container .voice-container::after {
content: '\E803';
diff --git a/style/style.css b/style/style.css
index 0d6f668..54e7d23 100644
--- a/style/style.css
+++ b/style/style.css
@@ -43,7 +43,8 @@ ul {
border: none;
font-size: 1.3em;
width: 270px;
- margin: 0 0 0 17px;
+ margin: 1px 0 0 20px;
+ border-radius: 3px;
}
.input-area:focus {
@@ -107,6 +108,10 @@ ul {
font-size: 22px;
}
+.title-container.long-text {
+ font-size: 16px;
+}
+
.title-container .title-phonetic {
display: none;
}
@@ -277,12 +282,14 @@ footer {
font-size: 0.3em;
text-align: center;
position: relative;
+ color: rgba(0, 0, 0, 0.2);
}
footer img {
position: relative;
top:4px;
width: 50px;
+ opacity: 0.6;
}
.contact-info {
@@ -371,6 +378,11 @@ footer img {
margin-top: 5px;
}
+.setting-block .link-query-help {
+ margin-left: 18px;
+ cursor: help;
+}
+
.setting-block label {
margin-left: 5px;
}
diff --git a/utility.js b/utility.js
index f2651d1..d8efb33 100644
--- a/utility.js
+++ b/utility.js
@@ -10,15 +10,17 @@ var urls = {
var settings = {
selectMode : "mouseSelect", //划词的形式:直接划词 | Ctrl+划词
- showPosition : "near", //划词翻译结果显示的位置
- //duration : 5, //翻译结果显示的时间
+ showPosition : "near", //划词翻译结果显示的位置
+ //duration : 5, //翻译结果显示的时间
toggleKey : "ctrl",
- showTips : true //是否显示Tips
+ showTips : true, //是否显示Tips
+ currentWord: "", //当前划词查询的内容
+ linkQuery: false //在链接上划词
}
var frames = {
//title frame
- titleContainer : "
#{1}#{2}
",
+ titleContainer : "
#{1}#{2}
",
titleWord : "
#{1}#{2}
",
voiceContainer : "
",
titleTranslation : "
#{1}
",