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

readerannotation: fix matchFunc (#12270)

Browse Source
This commit is contained in:
hius07
2024-08-02 22:36:34 +03:00
committed by GitHub
parent 3567a59bcb
commit 74e863c9bb
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/apps/reader/modules/readerannotation.lua
View File

@@ -340,22 +340,21 @@ function ReaderAnnotation:getMatchFunc()
local doesMatch
if self.ui.rolling then
doesMatch = function(a, b)
if a.datetime ~= nil and b.datetime ~= nil and a.datetime ~= b.datetime then
return false
end
if a.pos0 ~= b.pos0 or a.pos1 ~= b.pos1 or (a.text_orig or a.text) ~= (b.text_orig or b.text) then
if (a.datetime ~= nil and b.datetime ~= nil and a.datetime ~= b.datetime)
or (not a.drawer) ~= (not b.drawer)
or a.page ~= b.page
or a.pos1 ~= b.pos1 then
return false
end
return true
end
else
doesMatch = function(a, b)
if a.datetime ~= nil and b.datetime ~= nil and a.datetime ~= b.datetime then
return false
end
if a.pos0.page ~= b.pos0.page or a.pos0.x ~= b.pos0.x or a.pos1.x ~= b.pos1.x
or a.pos0.y ~= b.pos0.y or a.pos1.y ~= b.pos1.y
or (a.text_orig or a.text) ~= (b.text_orig or b.text) then
if (a.datetime ~= nil and b.datetime ~= nil and a.datetime ~= b.datetime)
or (not a.drawer) ~= (not b.drawer)
or a.page ~= b.page
or (a.pos0 and (a.pos0.x ~= b.pos0.x or a.pos1.x ~= b.pos1.x
or a.pos0.y ~= b.pos0.y or a.pos1.y ~= b.pos1.y)) then
return false
end
return true