[Pkg-javascript-commits] [pdf.js] 229/414: Merge pull request #6988 from timvandermeij/fileattachment-annotation

[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 41efb92d3a6af0be38afaf27808504e404491afd
Merge: c53581f 0351c7e
Author: Jonas Jenwald <jonas.jenwald at gmail.com>
Date:   Wed Feb 24 12:58:06 2016 +0100

    Merge pull request #6988 from timvandermeij/fileattachment-annotation
    
    Implement support for FileAttachment annotations

 extensions/b2g/viewer.js                          |   2 +-
 extensions/firefox/content/PdfStreamConverter.jsm |   2 +-
 src/core/annotation.js                            |  30 ++++++++
 src/core/obj.js                                   |   1 +
 src/display/annotation_layer.js                   |  79 +++++++++++++++++++++-
 src/shared/util.js                                |  12 ++++
 test/pdfs/.gitignore                              |   1 +
 test/pdfs/annotation-fileattachment.pdf           | Bin 0 -> 93322 bytes
 test/test_manifest.json                           |   7 ++
 test/unit/annotation_layer_spec.js                |  47 ++++++++++++-
 test/unit/util_spec.js                            |  17 ++++-
 web/annotation_layer_builder.css                  |   3 +-
 web/annotation_layer_builder.js                   |   5 +-
 web/pdf_attachment_view.js                        |   4 +-
 web/pdf_page_view.js                              |   3 +-
 web/pdf_viewer.component.js                       |   5 +-
 web/pdf_viewer.js                                 |   6 +-
 web/ui_utils.js                                   |   9 ---
 web/viewer.js                                     |  23 ++++---
 19 files changed, 222 insertions(+), 34 deletions(-)


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