[Pkg-javascript-commits] [pdf.js] 29/157: Merge pull request #5585 from timvandermeij/annotation-layer-borderstyle

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository pdf.js.

commit 98339f63a8c5e1592022b083a1a9c6975f2f1f5d
Merge: 0a744fb 6007a57
Author: Brendan Dahl <brendan.dahl at gmail.com>
Date:   Wed Jul 1 10:48:12 2015 -0700

    Merge pull request #5585 from timvandermeij/annotation-layer-borderstyle
    
    Annotation border styles

 make.js                                |   3 +-
 src/core/annotation.js                 | 218 ++++++++++++++++++++++++++-------
 src/display/annotation_helper.js       |  70 +++++++++--
 src/shared/util.js                     |   8 ++
 test/pdfs/.gitignore                   |   1 +
 test/pdfs/annotation-border-styles.pdf | Bin 0 -> 89833 bytes
 test/test_manifest.json                |   6 +
 test/unit/annotation_layer_spec.js     |  84 +++++++++++++
 test/unit/unit_test.html               |   1 +
 9 files changed, 337 insertions(+), 54 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git