Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag

2017-05-31 12:55:05 +02:00
parent 82f5d3c96f 8ab9248a78
commit 3465710237
5 changed files with 267 additions and 5 deletions
--- a/www/common/boot2.js
+++ b/www/common/boot2.js
@@ -7,7 +7,9 @@ define([], function () {
            // jquery declares itself as literally "jquery" so it cannot be pulled by path :(
            "jquery": "/bower_components/jquery/dist/jquery.min",
            // json.sortify same
-            "json.sortify": "/bower_components/json.sortify/dist/JSON.sortify"
+            "json.sortify": "/bower_components/json.sortify/dist/JSON.sortify",
+            "pdfjs-dist/build/pdf": "/bower_components/pdfjs-dist/build/pdf",
+            "pdfjs-dist/build/pdf.worker": "/bower_components/pdfjs-dist/build/pdf.worker"
        }
    });

--- a/www/common/media-tag.js
+++ b/www/common/media-tag.js