Skip to content

MozillaCompoundTextInfo: Don't skip ignored objects when determining whether the range covers the end of any ancestors of endObj. #9477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feerrenrut merged 3 commits into from
Apr 12, 2019
Merged

MozillaCompoundTextInfo: Don't skip ignored objects when determining whether the range covers the end of any ancestors of endObj. #9477

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e73a04c
MozillaCompoundTextInfo: Don't skip ignored objects when determining …
jcsteh Apr 10, 2019
f6aae3d
Merge branch 'master' into ia2TextMozillaEndOfNodeFix
jcsteh Apr 10, 2019
8b48838
Add Mozilla Corporation to contributors.
jcsteh Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions source/NVDAObjects/IAccessible/ia2TextMozilla.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#A part of NonVisual Desktop Access (NVDA)
#This file is covered by the GNU General Public License.
#See the file COPYING for more details.
#Copyright (C) 2015-2017 NV Access Limited
#Copyright (C) 2015-2019 NV Access Limited, Mozilla Corporation

"""Support for the IAccessible2 rich text model first implemented by Mozilla.
This is now used by other applications as well.
Expand Down Expand Up @@ -324,11 +324,12 @@ def _getText(self, withFields, formatConfig=None):
field = controlStack.pop()
if field:
fields.append(textInfos.FieldCommand("controlEnd", None))
if ti.compareEndPoints(self._makeRawTextInfo(obj, textInfos.POSITION_ALL), "endToEnd") == 0:
if ti.compareEndPoints(self._makeRawTextInfo(obj, textInfos.POSITION_ALL), "endToEnd") == 0:
if field:
Comment thread
feerrenrut marked this conversation as resolved.
field["_endOfNode"] = True
else:
# We're not at the end of this object, which also means we're not at the end of any ancestors.
break
else:
# We're not at the end of this object, which also means we're not at the end of any ancestors.
break
ti = self._getEmbedding(obj)
obj = ti.obj

Expand Down