Simplify annotation data passing #6232
Conversation
timvandermeij
changed the title
timvandermeij
force-pushed
the
annotations-data-passing
branch
from
eebb555 to
981202f
Compare
| } | ||
| return annotationsData; | ||
| }, | ||
|
|
||
| get annotations() { | ||
| var annotations = []; | ||
| var annotationRefs = (this.annotationRefs || []); | ||
| var annotationRefs = (this.getInheritedPageProp('Annots') || []); |
There was a problem hiding this comment.
While you're at it, remove the parentheses. They are not required, and do not enhance the readability of this line.
There was a problem hiding this comment.
Done in the new commit.
timvandermeij
force-pushed
the
annotations-data-passing
branch
from
981202f to
995c5ba
Compare
|
/botio-linux preview |
From: Bot.io (Linux)ReceivedCommand cmd_preview from @timvandermeij received. Current queue size: 0 Live output at: http://107.21.233.14:8877/d3613037ba95209/output.txt |
From: Bot.io (Linux)SuccessFull output at http://107.21.233.14:8877/d3613037ba95209/output.txt Total script time: 0.62 mins Published |
|
/botio test |
From: Bot.io (Linux)ReceivedCommand cmd_test from @timvandermeij received. Current queue size: 0 Live output at: http://107.21.233.14:8877/88b6a79c47252a7/output.txt |
From: Bot.io (Windows)ReceivedCommand cmd_test from @timvandermeij received. Current queue size: 0 Live output at: http://107.22.172.223:8877/3f8eb82a935f957/output.txt |
From: Bot.io (Windows)SuccessFull output at http://107.22.172.223:8877/3f8eb82a935f957/output.txt Total script time: 18.28 mins
|
From: Bot.io (Linux)SuccessFull output at http://107.21.233.14:8877/88b6a79c47252a7/output.txt Total script time: 18.76 mins
|
Simplify annotation data passing
|
Looks good, thanks! |
We can avoid the
getDatamethod call by just accessing thedataproperty on the annotation object. We can avoidget annotationRefsby directly using its result (like all other methods in that file). Finally,getAnnotationsinapi.jscan be simplified by interchanging the cases, i.e., always returing the promise and only creating it when it does not exist yet.I have verified with 15 test files with different annotation types (Link, Text, Widget, Markup, et cetera) that rendering has not changed.
@Snuffleupagus Could you review this PR?