Skip to content

Kindle 1.19 support #6638

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
jcsteh merged 14 commits into from
Jan 23, 2017
Merged

Kindle 1.19 support #6638

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
110281d
Fix failure to detect focus change when opening a book from the Kindl…
jcsteh Nov 3, 2016
6498b80
Allow TextInfos to override getFormatFieldSpeech.
jcsteh Dec 13, 2016
62f42c6
CursorManager: Refactor selection code to work for TextInfos that are…
jcsteh Dec 13, 2016
8ebf365
RootProxyTextInfo: Proxy pointAtStart to the inner TextInfo. This is …
jcsteh Dec 13, 2016
fc4b7b0
IA2TextTextInfo: When fetching IA2 text attributes, don't go back one…
jcsteh Dec 13, 2016
a3a0f4e
Compound TextInfos: Don't set the name attribute on control fields fo…
jcsteh Dec 13, 2016
6b67973
MozillaCompoundTextInfo: Support instantiation from NVDAObject.
jcsteh Dec 13, 2016
f853d44
MozillaCompoundTextInfo: Support retrieving selection even when the i…
jcsteh Dec 13, 2016
e5bf6bc
Various fixes in CompoundTextInfo and MozillaCompoundTextInfo:
jcsteh Dec 13, 2016
472e20c
Support for new Kindle functionality introduced in Kindle 1.19, as we…
jcsteh Dec 13, 2016
364b566
Document Kindle support in User Guide.
jcsteh Dec 13, 2016
ed51c55
User Guide clarification.
jcsteh Dec 15, 2016
5f4c4bf
Kindle: In the Elements List, don't provide options for Headings and …
jcsteh Jan 11, 2017
9cfc9b9
Fix failure when uninstalling add-ons that have an installTasks modul…
jcsteh Jan 19, 2017
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
Prev Previous commit
Next Next commit
Various fixes in CompoundTextInfo and MozillaCompoundTextInfo: 
* Fix CompoundTextInfo.__eq__ when comparing against TextInfos of other types.
* Fix MozillaCompoundTextInfo.move for backwards movement.
* Fix off-by-one error in CompoundTextInfo which broke CursorManager selection across embedded objects.
  • Loading branch information
@jcsteh
jcsteh committed Dec 13, 2016
commit e5bf6bcb60e32f174ed346bc6ba9fd90157222f5
5 changes: 4 additions & 1 deletion source/NVDAObjects/IAccessible/ia2TextMozilla.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,10 @@ def move(self, unit, direction, endPoint=None):
# Find the edge of the current unit in the requested direction.
moveTi, moveObj = self._findUnitEndpoints(moveTi, unit, findStart=moveBack, findEnd=not moveBack)

if not moveBack:
if moveBack:
# Collapse to the start of the previous unit.
moveTi.collapse()
else:
# Collapse to the start of the next unit.
moveTi.collapse(end=True)
if moveTi.compareEndPoints(self._makeRawTextInfo(moveObj, textInfos.POSITION_ALL), "endToEnd") == 0:
Expand Down
8 changes: 7 additions & 1 deletion source/compoundDocuments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ def _normalizeStartAndEnd(self):
# Aside from being pointless, we don't want a collapsed end object, as this will cause bogus control fields to be emitted.
try:
self._end, self._endObj = self._findNextContent(self._endObj, moveBack=True)
self._end.move(textInfos.UNIT_OFFSET, 1)
# _end is now on the last character, but we want it collapsed after this.
self._end.move(textInfos.UNIT_OFFSET, 1, endPoint="end")
self._end.collapse(end=True)
except LookupError:
pass

Expand Down Expand Up @@ -152,6 +154,10 @@ def _getControlFieldForObject(self, obj, ignoreEditableText=True):
return field

def __eq__(self, other):
if self is other:
return True
if type(self) is not type(other):
return False
return self._start == other._start and self._startObj == other._startObj and self._end == other._end and self._endObj == other._endObj

def __ne__(self, other):
Expand Down