renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[fix, UX] Common menu & info menu: switch to dofile (#4713)

Browse Source 
Require is kept in memory, including the modifications made to it by MenuSorter. This can cause trouble when switching between the FileManager and Reader.

Fixes #4703.
This commit is contained in:
Frans de Jonge
2019-03-02 21:45:12 +01:00
committed by GitHub
parent e96ac7e7dc
commit 5b30ea1920
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/apps/filemanager/filemanagermenu.lua
View File

@@ -158,7 +158,7 @@ function FileManagerMenu:setUpdateItemTable()
}
end
-- insert common settings
for id, common_setting in pairs(require("ui/elements/common_settings_menu_table")) do
for id, common_setting in pairs(dofile("frontend/ui/elements/common_settings_menu_table.lua")) do
self.menu_items[id] = common_setting
end
@@ -275,7 +275,7 @@ function FileManagerMenu:setUpdateItemTable()
end
}
-- insert common info
for id, common_setting in pairs(require("ui/elements/common_info_menu_table")) do
for id, common_setting in pairs(dofile("frontend/ui/elements/common_info_menu_table.lua")) do
self.menu_items[id] = common_setting
end
self.menu_items.exit_menu = {

4
frontend/apps/reader/modules/readermenu.lua
View File

@@ -132,7 +132,7 @@ function ReaderMenu:setUpdateItemTable()
-- settings tab
-- insert common settings
for id, common_setting in pairs(require("ui/elements/common_settings_menu_table")) do
for id, common_setting in pairs(dofile("frontend/ui/elements/common_settings_menu_table.lua")) do
self.menu_items[id] = common_setting
end
-- insert DjVu render mode submenu just before the last entry (show advanced)
@@ -176,7 +176,7 @@ function ReaderMenu:setUpdateItemTable()
}
-- main menu tab
-- insert common info
for id, common_setting in pairs(require("ui/elements/common_info_menu_table")) do
for id, common_setting in pairs(dofile("frontend/ui/elements/common_info_menu_table.lua")) do
self.menu_items[id] = common_setting
end