From f575797b013a0442330fbb0f1226a96fef8bdd92 Mon Sep 17 00:00:00 2001 From: chrox Date: Wed, 20 Aug 2014 18:25:37 +0800 Subject: [PATCH] use original lookup word in wikipedia lookup --- frontend/apps/reader/modules/readerdictionary.lua | 8 +++++--- frontend/apps/reader/modules/readerwikipedia.lua | 4 ++-- frontend/ui/widget/dictquicklookup.lua | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/apps/reader/modules/readerdictionary.lua b/frontend/apps/reader/modules/readerdictionary.lua index 6f5119283..c12b916b0 100644 --- a/frontend/apps/reader/modules/readerdictionary.lua +++ b/frontend/apps/reader/modules/readerdictionary.lua @@ -30,7 +30,7 @@ function ReaderDictionary:stardictLookup(word, box) local ok, results = pcall(JSON.decode, JSON, results_str) if ok and results then DEBUG("lookup result table:", word, results) - self:showDict(results, box) + self:showDict(word, results, box) else -- dummy results results = { @@ -41,18 +41,20 @@ function ReaderDictionary:stardictLookup(word, box) } } DEBUG("dummy result table:", word, results) - self:showDict(results, box) + self:showDict(word, results, box) end end end -function ReaderDictionary:showDict(results, box) +function ReaderDictionary:showDict(word, results, box) if results and results[1] then DEBUG("showing quick lookup window") UIManager:show(DictQuickLookup:new{ ui = self.ui, highlight = self.highlight, dialog = self.dialog, + -- original lookup word + word = word, results = results, dictionary = self.default_dictionary, width = Screen:getWidth() - Screen:scaleByDPI(80), diff --git a/frontend/apps/reader/modules/readerwikipedia.lua b/frontend/apps/reader/modules/readerwikipedia.lua index 984fc2028..f1418eff8 100644 --- a/frontend/apps/reader/modules/readerwikipedia.lua +++ b/frontend/apps/reader/modules/readerwikipedia.lua @@ -44,7 +44,7 @@ function ReaderWikipedia:onLookupWikipedia(word, box) table.insert(results, result) end DEBUG("lookup result:", word, results) - self:showDict(results, box) + self:showDict(word, results, box) else DEBUG("error:", pages) -- dummy results @@ -56,7 +56,7 @@ function ReaderWikipedia:onLookupWikipedia(word, box) } } DEBUG("dummy result table:", word, results) - self:showDict(results, box) + self:showDict(word, results, box) end end diff --git a/frontend/ui/widget/dictquicklookup.lua b/frontend/ui/widget/dictquicklookup.lua index cb4b62ccb..987379d21 100644 --- a/frontend/ui/widget/dictquicklookup.lua +++ b/frontend/ui/widget/dictquicklookup.lua @@ -404,7 +404,7 @@ function DictQuickLookup:closeInputDialog() end function DictQuickLookup:lookupWikipedia() - self.ui:handleEvent(Event:new("LookupWikipedia", self.lookupword, self.word_box)) + self.ui:handleEvent(Event:new("LookupWikipedia", self.word, self.word_box)) end return DictQuickLookup