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

Enable Edit (rename bookmark) when tap on highlight (#3369)

Browse Source 
Also fix a few crash possibilities when unhighlighting.
Also fix bug with binary search that could not be able to remove bookmark
when there are multiple bookmarks/highlights on the same page.
This commit is contained in:
poire-z
2017-10-18 17:19:06 +02:00
committed by Frans de Jonge
parent 3c99600835
commit 29708884c7
2 changed files with 105 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
frontend/apps/reader/modules/readerbookmark.lua
View File

@@ -252,7 +252,7 @@ function ReaderBookmark:onShowBookmark()
end,
ok_text = _("Remove"),
ok_callback = function()
bookmark:removeHightligit(item)
bookmark:removeHighlight(item)
bm_menu:switchItemTable(nil, bookmark.bookmarks, -1)
UIManager:close(self.textviewer)
end,
@@ -368,7 +368,7 @@ function ReaderBookmark:isBookmarkAdded(item)
return false
end
function ReaderBookmark:removeHightligit(item)
function ReaderBookmark:removeHighlight(item)
if item.pos0 then
self.ui:handleEvent(Event:new("Unhighlight", item))
else
@@ -391,9 +391,41 @@ function ReaderBookmark:removeBookmark(item)
_start = _middle + 1
end
end
-- If we haven't found item, it may be because there are multiple
-- bookmarks on the same page, and the above binary search decided to
-- not search on one side of one it found on page, where item could be.
-- Fallback to do a full scan.
logger.dbg("removeBookmark: binary search didn't find bookmark, doing full scan")
for i=1, #self.bookmarks do
local v = self.bookmarks[i]
if item.datetime == v.datetime and item.page == v.page then
return table.remove(self.bookmarks, i)
end
end
logger.warn("removeBookmark: full scan search didn't find bookmark")
end
function ReaderBookmark:renameBookmark(item)
function ReaderBookmark:renameBookmark(item, from_highlight)
if from_highlight then
-- Called by ReaderHighlight:editHighlight, we need to find the bookmark
for i=1, #self.bookmarks do
if item.datetime == self.bookmarks[i].datetime and item.page == self.bookmarks[i].page then
item = self.bookmarks[i]
if item.text == nil or item.text == "" then
-- Make up bookmark text as done in onShowBookmark
local page = item.page
if not self.ui.document.info.has_pages then
page = self.ui.document:getPageFromXPointer(page)
end
item.text = T(_("Page %1 %2 @ %3"), page, item.notes, item.datetime)
end
break
end
end
if item.text == nil then -- bookmark not found
return
end
end
self.input = InputDialog:new{
title = _("Rename bookmark"),
input = item.text,
@@ -417,7 +449,9 @@ function ReaderBookmark:renameBookmark(item)
item.pos1 == self.bookmarks[i].pos1 and item.page == self.bookmarks[i].page then
self.bookmarks[i].text = value
UIManager:close(self.input)
self.refresh()
if not from_highlight then
self.refresh()
end
break
end
end