use original lookup word in wikipedia lookup

pull/818/head
chrox 10 years ago
parent a275a8cc89
commit f575797b01

@ -30,7 +30,7 @@ function ReaderDictionary:stardictLookup(word, box)
local ok, results = pcall(JSON.decode, JSON, results_str) local ok, results = pcall(JSON.decode, JSON, results_str)
if ok and results then if ok and results then
DEBUG("lookup result table:", word, results) DEBUG("lookup result table:", word, results)
self:showDict(results, box) self:showDict(word, results, box)
else else
-- dummy results -- dummy results
results = { results = {
@ -41,18 +41,20 @@ function ReaderDictionary:stardictLookup(word, box)
} }
} }
DEBUG("dummy result table:", word, results) DEBUG("dummy result table:", word, results)
self:showDict(results, box) self:showDict(word, results, box)
end end
end end
end end
function ReaderDictionary:showDict(results, box) function ReaderDictionary:showDict(word, results, box)
if results and results[1] then if results and results[1] then
DEBUG("showing quick lookup window") DEBUG("showing quick lookup window")
UIManager:show(DictQuickLookup:new{ UIManager:show(DictQuickLookup:new{
ui = self.ui, ui = self.ui,
highlight = self.highlight, highlight = self.highlight,
dialog = self.dialog, dialog = self.dialog,
-- original lookup word
word = word,
results = results, results = results,
dictionary = self.default_dictionary, dictionary = self.default_dictionary,
width = Screen:getWidth() - Screen:scaleByDPI(80), width = Screen:getWidth() - Screen:scaleByDPI(80),

@ -44,7 +44,7 @@ function ReaderWikipedia:onLookupWikipedia(word, box)
table.insert(results, result) table.insert(results, result)
end end
DEBUG("lookup result:", word, results) DEBUG("lookup result:", word, results)
self:showDict(results, box) self:showDict(word, results, box)
else else
DEBUG("error:", pages) DEBUG("error:", pages)
-- dummy results -- dummy results
@ -56,7 +56,7 @@ function ReaderWikipedia:onLookupWikipedia(word, box)
} }
} }
DEBUG("dummy result table:", word, results) DEBUG("dummy result table:", word, results)
self:showDict(results, box) self:showDict(word, results, box)
end end
end end

@ -404,7 +404,7 @@ function DictQuickLookup:closeInputDialog()
end end
function DictQuickLookup:lookupWikipedia() 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 end
return DictQuickLookup return DictQuickLookup

Loading…
Cancel
Save