From 6a0554f22667d9cbd6c6674cd9f76ee324024c63 Mon Sep 17 00:00:00 2001 From: chrox Date: Mon, 1 Dec 2014 14:38:32 +0800 Subject: [PATCH 1/3] make coverage in after_success stage So that if the coverage job is timeout it won't fail the CI result. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 22ee9e14f..496f62688 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ script: - make fetchthirdparty all - sudo cp base/build/*/luajit /usr/bin/ - make testfront - - make coverage after_success: + - make coverage - cd koreader-*/koreader && luacov-coveralls -v From d6c4465c474b76707bfa8d52d105e87f31d21e3b Mon Sep 17 00:00:00 2001 From: chrox Date: Mon, 1 Dec 2014 14:46:17 +0800 Subject: [PATCH 2/3] fix coverage test fails on OPDS browser module for some reason luxl.lua has problem when being set hook for luacov --- spec/unit/opds_spec.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/unit/opds_spec.lua b/spec/unit/opds_spec.lua index fade2f151..0328c4b26 100644 --- a/spec/unit/opds_spec.lua +++ b/spec/unit/opds_spec.lua @@ -231,8 +231,8 @@ require("commonrequire") local OPDSParser = require("ui/opdsparser") local DEBUG = require("dbg") -describe("OPDS module", function() - describe("OPDS parser module #nocov", function() +describe("OPDS module #nocov", function() + describe("OPDS parser module", function() it("should parse OPDS navigation catalog", function() local catalog = OPDSParser:parse(navigation_sample) local feed = catalog.feed From 20fd6f902e1b1c2d47232442699d0d0254dba5f4 Mon Sep 17 00:00:00 2001 From: chrox Date: Mon, 1 Dec 2014 15:32:12 +0800 Subject: [PATCH 3/3] fix #1175 --- frontend/apps/filemanager/filemanagermenu.lua | 7 ++++++- frontend/apps/reader/modules/readermenu.lua | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/apps/filemanager/filemanagermenu.lua b/frontend/apps/filemanager/filemanagermenu.lua index 4a839544f..5603e6e49 100644 --- a/frontend/apps/filemanager/filemanagermenu.lua +++ b/frontend/apps/filemanager/filemanagermenu.lua @@ -161,6 +161,7 @@ function FileManagerMenu:setUpdateItemTable() end function FileManagerMenu:onShowMenu() + local tab_index = G_reader_settings:readSetting("filemanagermenu_tab_index") or 1 if #self.tab_item_table.setting == 0 then self:setUpdateItemTable() end @@ -175,6 +176,7 @@ function FileManagerMenu:onShowMenu() local TouchMenu = require("ui/widget/touchmenu") main_menu = TouchMenu:new{ width = Screen:getWidth(), + last_index = tab_index, tab_item_table = { self.tab_item_table.setting, self.tab_item_table.info, @@ -195,7 +197,7 @@ function FileManagerMenu:onShowMenu() end main_menu.close_callback = function () - UIManager:close(menu_container) + self:onCloseFileManagerMenu() end menu_container[1] = main_menu @@ -207,6 +209,9 @@ function FileManagerMenu:onShowMenu() end function FileManagerMenu:onCloseFileManagerMenu() + local last_tab_index = self.menu_container[1].last_index + DEBUG("remember menu tab index", last_tab_index) + G_reader_settings:saveSetting("filemanagermenu_tab_index", last_tab_index) UIManager:close(self.menu_container) return true end diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua index bfd4516bc..310f3f1bd 100644 --- a/frontend/apps/reader/modules/readermenu.lua +++ b/frontend/apps/reader/modules/readermenu.lua @@ -226,7 +226,7 @@ function ReaderMenu:onSetDimensions(dimen) end function ReaderMenu:onReadSettings(config) - self.last_tab_index = config:readSetting("menu_tab_index") or 1 + self.last_tab_index = config:readSetting("readermenu_tab_index") or 1 end function ReaderMenu:onSaveSettings()