Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-11-10 01:10:34 +00:00
Code Issues Projects Releases Wiki Activity

readerannotation: fix doesMatch func (#12231)

Browse Source
This commit is contained in:
hius07 2024-07-29 17:39:44 +03:00 committed by GitHub
parent 817afe8ed7
commit 3919deef05
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,7 +334,7 @@ function ReaderAnnotation:getMatchFunc()
if a.datetime ~= nil and b.datetime ~= nil and a.datetime ~= b.datetime then
return false
end
if a.text ~= b.text or a.pos0 ~= b.pos0 or a.pos1 ~= b.pos1 then
if a.pos0 ~= b.pos0 or a.pos1 ~= b.pos1 or (a.text_orig or a.text) ~= (b.text_orig or b.text) then
return false
end
return true
@ -344,9 +344,9 @@ function ReaderAnnotation:getMatchFunc()
if a.datetime ~= nil and b.datetime ~= nil and a.datetime ~= b.datetime then
return false
end
if a.text ~= b.text or 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 then
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
return false
end
return true