diff --git a/frontend/ui/reader/readerbookmark.lua b/frontend/ui/reader/readerbookmark.lua index 4eb43ede2..af6d4753b 100644 --- a/frontend/ui/reader/readerbookmark.lua +++ b/frontend/ui/reader/readerbookmark.lua @@ -94,13 +94,14 @@ function ReaderBookmark:onShowBookmark() } -- buid up menu widget method as closure local doc = self.ui.document + local view = self.view local sendEv = function(ev) self.ui:handleEvent(ev) end function bm_menu:onMenuChoice(item) if doc.info.has_pages then sendEv(Event:new("PageUpdate", item.page)) - elseif self.view.view_mode == "page" then + elseif view.view_mode == "page" then sendEv(Event:new("PageUpdate", doc:getPageFromXPointer(item.page))) else sendEv(Event:new("PosUpdate", doc:getPosFromXPointer(item.page))) diff --git a/frontend/ui/reader/readerfont.lua b/frontend/ui/reader/readerfont.lua index 49ddc5f9d..a61aa4ce4 100644 --- a/frontend/ui/reader/readerfont.lua +++ b/frontend/ui/reader/readerfont.lua @@ -9,7 +9,7 @@ ReaderFont = InputContainer:new{ } function ReaderFont:init() - if not Device:hasNoKeyboard() then + if Device:hasKeyboard() then -- add shortcut for keyboard self.key_events = { ShowFontMenu = { {"F"}, doc = _("show font menu") }, diff --git a/frontend/ui/reader/readertoc.lua b/frontend/ui/reader/readertoc.lua index 6a227919e..b1be85dbf 100644 --- a/frontend/ui/reader/readertoc.lua +++ b/frontend/ui/reader/readertoc.lua @@ -4,7 +4,7 @@ ReaderToc = InputContainer:new{ } function ReaderToc:init() - if not Device:hasNoKeyboard() then + if Device:hasKeyboard() then self.key_events = { ShowToc = { { "T" }, diff --git a/frontend/ui/widget/infomessage.lua b/frontend/ui/widget/infomessage.lua index 464004985..157301421 100644 --- a/frontend/ui/widget/infomessage.lua +++ b/frontend/ui/widget/infomessage.lua @@ -13,11 +13,12 @@ InfoMessage = InputContainer:new{ function InfoMessage:init() if Device:hasKeyboard() then - key_events = { + self.key_events = { AnyKeyPressed = { { Input.group.Any }, seqtext = "any key", doc = _("close dialog") } } - else + end + if Device:isTouchDevice() then self.ges_events.TapClose = { GestureRange:new{ ges = "tap", diff --git a/frontend/ui/widget/notification.lua b/frontend/ui/widget/notification.lua index 2930fe304..43a76bff6 100644 --- a/frontend/ui/widget/notification.lua +++ b/frontend/ui/widget/notification.lua @@ -11,7 +11,7 @@ Notification = InputContainer:new{ function Notification:init() if Device:hasKeyboard() then - key_events = { + self.key_events = { AnyKeyPressed = { { Input.group.Any }, seqtext = "any key", doc = "close dialog" } } end