[Pkg-javascript-commits] [pdf.js] 138/414: Merge pull request #6822 from Snuffleupagus/urls-in-outline

[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 1eea0db897196417609ea3223fc9bd9728ed68ed
Merge: d9e21a3 0030a82
Author: Tim van der Meij <timvandermeij at gmail.com>
Date:   Tue Jan 19 22:21:40 2016 +0100

    Merge pull request #6822 from Snuffleupagus/urls-in-outline
    
    [api-minor] Add support for URLs in the document outline

 src/core/obj.js                 |  16 +++++++++++++---
 src/display/annotation_layer.js |  16 ++--------------
 src/display/api.js              |   1 +
 src/shared/util.js              |  21 +++++++++++++++++++++
 test/pdfs/.gitignore            |   1 +
 test/pdfs/issue3214.pdf         | Bin 0 -> 11139 bytes
 test/unit/api_spec.js           |  28 +++++++++++++++++++++++++---
 web/pdf_outline_view.js         |   4 ++++
 8 files changed, 67 insertions(+), 20 deletions(-)

diff --cc test/pdfs/.gitignore
index 5bb4440,528ed8d..ad15775
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@@ -10,8 -10,8 +10,9 @@@
  !issue1155r.pdf
  !issue2391-1.pdf
  !issue2391-2.pdf
+ !issue3214.pdf
  !issue4665.pdf
 +!issue4684.pdf
  !issue5801.pdf
  !issue5946.pdf
  !issue5972.pdf

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