diff -ur chrome.orig/content/dictionarytip/dictionarytipFunctions.js chrome/content/dictionarytip/dictionarytipFunctions.js --- chrome.orig/content/dictionarytip/dictionarytipFunctions.js 2006-01-29 21:32:40.000000000 +0900 +++ chrome/content/dictionarytip/dictionarytipFunctions.js 2006-02-24 03:49:07.000000000 +0900 @@ -35,20 +35,27 @@ * ***** END LICENSE BLOCK ***** */ function gooFilter(ftDoc){ var headingSpan = "goo辞書
"; -var xpath1 = "//BODY/DIV/TABLE[2]/./*//TD[1]/./*//TD[3]/*[not(TBODY) and not(TABLE)]"; -var xpath2 = "//BODY/DIV/TABLE[2]/./*//TD[1]/TABLE[1]/./*//TD[following-sibling::TD]/TABLE"; -var result1 = getNodesFromXPath(xpath1,ftDoc); -var result2 = getNodesFromXPath(xpath2,ftDoc); - - ftDoc.body.innerHTML = headingSpan; - for (i = 0 ; i < result1.snapshotLength ; i++){ - ftDoc.body.appendChild(result1.snapshotItem(i)); - } - for (i = 0 ; i < result2.snapshotLength ; i++){ - ftDoc.body.appendChild(result2.snapshotItem(i)); - } + var xpath1 = "//BODY/DIV/TABLE[2]/./*//TD[1]/./*//TD[3]/*[not(TBODY) and not(TABLE)]"; + var xpath2 = "//BODY/DIV/TABLE[2]/./*//TD[1]/TABLE[1]/./*//TD[following-sibling::TD]/TABLE"; + var xpath3 = "//BODY/DIV/TABLE[2]/TBODY/TR/TD[1]/TABLE[1]"; + var result1 = getNodesFromXPath(xpath1,ftDoc); + var result2 = getNodesFromXPath(xpath2,ftDoc); + var result3 = getNodesFromXPath(xpath3,ftDoc); + + ftDoc.body.innerHTML = headingSpan; + if (ftDoc.URL.indexOf("kind=all") != -1){ + for (i = 0 ; i < result3.snapshotLength ; i++){ + ftDoc.body.appendChild(result3.snapshotItem(i)); + } + } else { + for (i = 0 ; i < result1.snapshotLength ; i++){ + ftDoc.body.appendChild(result1.snapshotItem(i)); + } + for (i = 0 ; i < result2.snapshotLength ; i++){ + ftDoc.body.appendChild(result2.snapshotItem(i)); + } + } } - //contributed by Yukichi function EijirouFilter(ftDoc){ var headingSpan = "英辞郎 on the Web
"; diff -ur chrome.orig/content/dictionarytip/dictionarytipOverlay.js chrome/content/dictionarytip/dictionarytipOverlay.js --- chrome.orig/content/dictionarytip/dictionarytipOverlay.js 2006-01-29 19:39:14.000000000 +0900 +++ chrome/content/dictionarytip/dictionarytipOverlay.js 2006-02-24 03:52:35.000000000 +0900 @@ -83,7 +83,7 @@ ";Eng->Dutch,German->Eng;en->*;en->en;en->vie,vie->en;en->Chinese;en->Japanese;define,web search;" + "en->en,en->French,en->Italian,en->Spanish,en->Dutch,en->Portuguese,en->German,en->Russian,en->Japanese," + "en->Chinese(T),en->Chinese(S),en->Greek,en->Korean,en->Turkish,en->Hebrew,en->Arabic,en->Thai,en->Esperanto;" + - "*;jp<->en;jp->*;jp->*;en->malay;英和・和英オート,英和辞書,和英辞書,国語辞典"; + "*;jp<->en;jp->*;jp->*;en->malay;辞書全て,英和辞書,和英辞書,国語辞典"; var clickedWord; var aIndex; @@ -220,7 +220,7 @@ if (userPref == "no"){ return false; }else if (userPref == "ctrl"){ - if (!e.ctrlKey){ + if (!e.shiftKey){ return false; } } @@ -384,10 +384,7 @@ break; case "18" : var convertedWord = convertFromUnicode( 'EUC-JP', clickedWord ); if (prefLang == 0){ - if (convertedWord.match(/[A-Z0-9a-z_]+/)) - url = "http://dictionary.goo.ne.jp/search.php?mode=0&kind=ej&MT=" + escape(convertedWord); - else - url = "http://dictionary.goo.ne.jp/search.php?mode=0&kind=je&MT=" + escape(convertedWord); + url = "http://dictionary.goo.ne.jp/search.php?mode=0&kind=all&MT=" + escape(convertedWord); }else if(prefLang == 1){ url = "http://dictionary.goo.ne.jp/search.php?mode=0&kind=ej&MT=" + escape(convertedWord); }else if(prefLang == 2){ diff -ur chrome.orig/locale/dictionarytip/en-US/dictionarytip.dtd chrome/locale/dictionarytip/en-US/dictionarytip.dtd --- chrome.orig/locale/dictionarytip/en-US/dictionarytip.dtd 2005-10-27 16:15:00.000000000 +0900 +++ chrome/locale/dictionarytip/en-US/dictionarytip.dtd 2006-02-24 00:35:01.000000000 +0900 @@ -1,10 +1,10 @@ - + - \ No newline at end of file +