[minor] normalize a few requires (#13055)

This commit is contained in:
Frans de Jonge
2025-01-13 08:33:18 +01:00
committed by GitHub
parent 6792bb0a06
commit 12b075a4ac
10 changed files with 11 additions and 11 deletions

View File

@@ -182,7 +182,7 @@ function ReaderDeviceStatus:addToMainMenu(menu_items)
end,
keep_menu_open = true,
callback = function(touchmenu_instance)
local DoubleSpinWidget = require("/ui/widget/doublespinwidget")
local DoubleSpinWidget = require("ui/widget/doublespinwidget")
local thresholds_widget
thresholds_widget = DoubleSpinWidget:new{
title_text = _("Battery level alert thresholds"),

View File

@@ -360,7 +360,7 @@ When the book's language tag is not among our presets, no specific features will
return _("Left/right minimal sizes: language defaults")
end,
callback = function()
local DoubleSpinWidget = require("/ui/widget/doublespinwidget")
local DoubleSpinWidget = require("ui/widget/doublespinwidget")
local cre = require("document/credocument"):engineInit()
local hyph_alg, alg_left_hyphen_min, alg_right_hyphen_min = cre.getSelectedHyphDict() -- luacheck: no unused
local hyph_limits_widget = DoubleSpinWidget:new{

View File

@@ -95,7 +95,7 @@ end
local function getExternalFontDir()
if CanvasContext:hasSystemFonts() then
return require("frontend/ui/elements/font_settings"):getPath()
return require("ui/elements/font_settings"):getPath()
else
return os.getenv("EXT_FONT_DIR")
end

View File

@@ -6,7 +6,7 @@ local DataStorage = require("datastorage")
local ffiUtil = require("ffi/util")
local lfs = require("libs/libkoreader-lfs")
local logger = require("logger")
local LuaSettings = require("frontend/luasettings")
local LuaSettings = require("luasettings")
local SQ3 = require("lua-ljsqlite3/init")
local util = require("util")
local _ = require("gettext")

View File

@@ -8,7 +8,7 @@ local CheckButton = require("ui/widget/checkbutton")
local ConfirmBox = require("ui/widget/confirmbox")
local Device = require("device")
local DateTimeWidget = require("ui/widget/datetimewidget")
local DoubleSpinWidget = require("/ui/widget/doublespinwidget")
local DoubleSpinWidget = require("ui/widget/doublespinwidget")
local DeviceListener = require("device/devicelistener")
local Dispatcher = require("dispatcher")
local Event = require("ui/event")

View File

@@ -5,10 +5,10 @@ local DocSettings = require("docsettings")
local Event = require("ui/event")
local FileManager = require("apps/filemanager/filemanager")
local InfoMessage = require("ui/widget/infomessage")
local LuaSettings = require("frontend/luasettings")
local LuaSettings = require("luasettings")
local UIManager = require("ui/uimanager")
local WidgetContainer = require("ui/widget/container/widgetcontainer")
local util = require("frontend/util")
local util = require("util")
local BaseUtil = require("ffi/util")
local _ = require("gettext")

View File

@@ -7,7 +7,7 @@ local ReadHistory = require("readhistory")
local FFIUtil = require("ffi/util")
local FeedView = require("feed_view")
local InfoMessage = require("ui/widget/infomessage")
local LuaSettings = require("frontend/luasettings")
local LuaSettings = require("luasettings")
local UIManager = require("ui/uimanager")
local KeyValuePage = require("ui/widget/keyvaluepage")
local InputDialog = require("ui/widget/inputdialog")

View File

@@ -22,7 +22,7 @@ local FileManager = require("apps/filemanager/filemanager")
local InfoMessage = require("ui/widget/infomessage")
local InputDialog = require("ui/widget/inputdialog")
local JSON = require("json")
local LuaSettings = require("frontend/luasettings")
local LuaSettings = require("luasettings")
local Math = require("optmath")
local MultiConfirmBox = require("ui/widget/multiconfirmbox")
local MultiInputDialog = require("ui/widget/multiinputdialog")

View File

@@ -4,7 +4,7 @@ describe("luadata module", function()
require("commonrequire")
DataStorage = require("datastorage")
lfs = require("libs/libkoreader-lfs")
Settings = require("frontend/luadata"):open(DataStorage:getDataDir() .. "/this-is-not-a-valid-file")
Settings = require("luadata"):open(DataStorage:getDataDir() .. "/this-is-not-a-valid-file")
end)
it("should handle undefined keys", function()

View File

@@ -3,7 +3,7 @@ describe("luasettings module", function()
setup(function()
require("commonrequire")
DataStorage = require("datastorage")
Settings = require("frontend/luasettings"):open(DataStorage:getDataDir() .. "/this-is-not-a-valid-file")
Settings = require("luasettings"):open(DataStorage:getDataDir() .. "/this-is-not-a-valid-file")
end)
it("should handle undefined keys", function()