Skip to content
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.

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

More cleanup regarding annotation border styles #6215

Merged
merged 1 commit into from
Jul 17, 2015

Conversation

timvandermeij
Copy link
Contributor

This PR provides (minor) clean-up for the annotation border styles. There are three changes:

  • this.borderStyle.setStyle('S'); is wrong as setStyle takes a Name as parameter, not a string. Somehow we all missed this during review, but fortunately we do not even need that line because the solid border style is the default.
  • The drawBorder parameter for initContainer has become unused after the annotation border style refactoring, so we can remove it.
  • A unit test has been adjusted for the same reason as the first point: setStyle takes a Name as parameter, not a dictionary (even though that worked too, it is better to keep it the same as what we expect).

@Snuffleupagus Could you review this one too?

var dict = new Dict();
dict.name = 'D';
borderStyle.setStyle(dict);
borderStyle.setStyle({ name: 'D' });
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't a Name actually what you want to use here, since that is what dict.get('S') (in annotation.js) will return?
If so, using borderStyle.setStyle(Name.get('D')); here should be slightly more clear.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in the new commit.

@Snuffleupagus
Copy link
Collaborator

Good to merge, once the comment is addressed.

@timvandermeij timvandermeij force-pushed the annotation-border-fixes branch 2 times, most recently from 58876ad to bed4d67 Compare July 17, 2015 19:40
@timvandermeij timvandermeij force-pushed the annotation-border-fixes branch from bed4d67 to 465611a Compare July 17, 2015 19:51
@timvandermeij
Copy link
Contributor Author

/botio-linux preview

@pdfjsbot
Copy link

From: Bot.io (Linux)


Received

Command cmd_preview from @timvandermeij received. Current queue size: 0

Live output at: http://107.21.233.14:8877/a775534359e4732/output.txt

@timvandermeij
Copy link
Contributor Author

/botio test

@pdfjsbot
Copy link

From: Bot.io (Windows)


Received

Command cmd_test from @timvandermeij received. Current queue size: 0

Live output at: http://107.22.172.223:8877/b42b95122f9b283/output.txt

@pdfjsbot
Copy link

From: Bot.io (Linux)


Received

Command cmd_test from @timvandermeij received. Current queue size: 0

Live output at: http://107.21.233.14:8877/d273f2bcbf179f4/output.txt

@pdfjsbot
Copy link

From: Bot.io (Linux)


Success

Full output at http://107.21.233.14:8877/d273f2bcbf179f4/output.txt

Total script time: 19.36 mins

  • Font tests: Passed
  • Unit tests: Passed
  • Regression tests: Passed

@pdfjsbot
Copy link

From: Bot.io (Windows)


Success

Full output at http://107.22.172.223:8877/b42b95122f9b283/output.txt

Total script time: 20.04 mins

  • Font tests: Passed
  • Unit tests: Passed
  • Regression tests: Passed

Snuffleupagus added a commit that referenced this pull request Jul 17, 2015
More cleanup regarding annotation border styles
@Snuffleupagus Snuffleupagus merged commit 7065c1b into mozilla:master Jul 17, 2015
@Snuffleupagus
Copy link
Collaborator

Looks good, thanks!

@timvandermeij timvandermeij deleted the annotation-border-fixes branch July 17, 2015 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants