[Pkg-javascript-commits] [pdf.js] 161/414: Merge pull request #6753 from yurydelendik/cdn-worker

[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 252b9d5910b787250e5882e8a50b7eb609a4af15
Merge: e44dada 1e45f2d
Author: Brendan Dahl <brendan.dahl at gmail.com>
Date:   Wed Jan 27 13:21:10 2016 -0800

    Merge pull request #6753 from yurydelendik/cdn-worker
    
    Wraps worker script if its cross-origin location is detected.

 src/display/api.js | 17 +++++++++++++++++
 src/shared/util.js | 16 ++++++++++++++++
 2 files changed, 33 insertions(+)

diff --cc src/shared/util.js
index cdc8113,ce7e795..93c869d
--- a/src/shared/util.js
+++ b/src/shared/util.js
@@@ -2349,8 -2306,8 +2364,9 @@@ exports.isExternalLinkTargetSet = isExt
  exports.isInt = isInt;
  exports.isNum = isNum;
  exports.isString = isString;
+ exports.isSameOrigin = isSameOrigin;
  exports.isValidUrl = isValidUrl;
 +exports.addLinkAttributes = addLinkAttributes;
  exports.loadJpegStream = loadJpegStream;
  exports.log2 = log2;
  exports.readInt8 = readInt8;

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