[Pkg-javascript-commits] [pdf.js] 148/210: Merge pull request #4549 from Rob--W/crx-pdf-embed-object

[David Prévot]

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

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

commit 6d330250dadcca8a7a97bafffc7b2650fbd05f2d
Merge: 7f6cb0e 3fdd334
Author: Tim van der Meij <timvandermeij at gmail.com>
Date:   Wed May 14 20:55:11 2014 +0200

    Merge pull request #4549 from Rob--W/crx-pdf-embed-object
    
    <object> / <embed> support in Chrome / Opera

 extensions/chromium/contentscript.js | 109 ++++++++++++++++++++++++++++++++---
 extensions/chromium/contentstyle.css |  13 +++++
 extensions/chromium/manifest.json    |   2 +
 3 files changed, 116 insertions(+), 8 deletions(-)

diff --cc extensions/chromium/manifest.json
index 5ae4e3f,a8dabb2..214787f
--- a/extensions/chromium/manifest.json
+++ b/extensions/chromium/manifest.json
@@@ -25,9 -25,10 +25,11 @@@
        "file://*/*"
      ],
      "run_at": "document_start",
+     "all_frames": true,
+     "css": ["contentstyle.css"],
      "js": ["contentscript.js"]
    }],
 +  "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
    "file_browser_handlers": [{
      "id": "open-as-pdf",
      "default_title": "Open with PDF Viewer",

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