From 11083022b073dc09a8488510ed0b3153817a64b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Gannaz?= Date: Thu, 12 Oct 2023 14:52:11 +0200 Subject: [PATCH] Minor code quality improvements (#10905) --- frontend/apps/reader/modules/readersearch.lua | 8 ++++---- frontend/document/doccache.lua | 2 +- frontend/ui/widget/focusmanager.lua | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/apps/reader/modules/readersearch.lua b/frontend/apps/reader/modules/readersearch.lua index b953edde8..e4f1b75a1 100644 --- a/frontend/apps/reader/modules/readersearch.lua +++ b/frontend/apps/reader/modules/readersearch.lua @@ -287,12 +287,12 @@ function ReaderSearch:onShowSearchDialog(text, direction, regex, case_insensitiv self.wait_button.movable:setMovedOffset(self.search_dialog.movable:getMovedOffset()) UIManager:show(self.wait_button) UIManager:tickAfterNext(function() - do_search(func, pattern, param, regex, case_insensitive)() + do_search(func, pattern, param)() UIManager:close(self.wait_button) end) end else - return do_search(func, pattern, param, regex, case_insensitive) + return do_search(func, pattern, param) end end self.search_dialog = ButtonDialog:new{ @@ -342,14 +342,14 @@ function ReaderSearch:onShowSearchDialog(text, direction, regex, case_insensitiv -- initial position: center of the screen UIManager:show(self.wait_button) UIManager:tickAfterNext(function() - do_search(self.searchFromCurrent, text, direction, regex, case_insensitive)() + do_search(self.searchFromCurrent, text, direction)() UIManager:close(self.wait_button) UIManager:show(self.search_dialog) --- @todo regional UIManager:setDirty(self.dialog, "partial") end) else - do_search(self.searchFromCurrent, text, direction, regex, case_insensitive)() + do_search(self.searchFromCurrent, text, direction)() UIManager:show(self.search_dialog) --- @todo regional UIManager:setDirty(self.dialog, "partial") diff --git a/frontend/document/doccache.lua b/frontend/document/doccache.lua index cb7c66774..e62ed780c 100644 --- a/frontend/document/doccache.lua +++ b/frontend/document/doccache.lua @@ -38,7 +38,7 @@ local function computeCacheSlots() --- ...otherwise, effectively disable the cache by making it single slot... if mb_size < 8 then - logger.dbg(string.format("Setting up a minimal single slot global document cache")) + logger.dbg("Setting up a minimal single slot global document cache") return 1 else return nil diff --git a/frontend/ui/widget/focusmanager.lua b/frontend/ui/widget/focusmanager.lua index fb750d722..ee13d065a 100644 --- a/frontend/ui/widget/focusmanager.lua +++ b/frontend/ui/widget/focusmanager.lua @@ -369,7 +369,7 @@ end function FocusManager:_verticalStep(dy) local x = self.selected.x - if type(self.layout[self.selected.y + dy]) ~= "table" or self.layout[self.selected.y + dy] == {} then + if type(self.layout[self.selected.y + dy]) ~= "table" or next(self.layout[self.selected.y + dy]) == nil then logger.err("[FocusManager] : Malformed layout") return false end