From 64dc1784d3d11f6aac8b731db4add4ed5965f4b1 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 19 Sep 2016 10:31:24 +0100 Subject: [PATCH] switch to patched version of pdfjs --- services/web/Gruntfile.coffee | 4 ++-- services/web/app/coffee/infrastructure/ExpressLocals.coffee | 6 +++--- services/web/app/views/project/editor.jade | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/services/web/Gruntfile.coffee b/services/web/Gruntfile.coffee index 4307621af5..60fa6ba0dd 100644 --- a/services/web/Gruntfile.coffee +++ b/services/web/Gruntfile.coffee @@ -159,10 +159,10 @@ module.exports = (grunt) -> paths: "moment": "libs/moment-2.9.0" "mathjax": "/js/libs/mathjax/MathJax.js?config=TeX-AMS_HTML" - "libs/pdf": "libs/pdfjs-1.3.91/pdf" + "libs/pdf": "libs/pdfjs-1.3.91p1/pdf" shim: "libs/pdf": - deps: ["libs/pdfjs-1.3.91/compatibility"] + deps: ["libs/pdfjs-1.3.91p1/compatibility"] skipDirOptimize: true modules: [ diff --git a/services/web/app/coffee/infrastructure/ExpressLocals.coffee b/services/web/app/coffee/infrastructure/ExpressLocals.coffee index d3b9d9a24b..70d64ab7ef 100644 --- a/services/web/app/coffee/infrastructure/ExpressLocals.coffee +++ b/services/web/app/coffee/infrastructure/ExpressLocals.coffee @@ -27,9 +27,9 @@ for path in [ "#{jsPath}main.js", "#{jsPath}libs.js", "#{jsPath}ace/ace.js", - "#{jsPath}libs/pdfjs-1.3.91/pdf.js", - "#{jsPath}libs/pdfjs-1.3.91/pdf.worker.js", - "#{jsPath}libs/pdfjs-1.3.91/compatibility.js", + "#{jsPath}libs/pdfjs-1.3.91p1/pdf.js", + "#{jsPath}libs/pdfjs-1.3.91p1/pdf.worker.js", + "#{jsPath}libs/pdfjs-1.3.91p1/compatibility.js", "/stylesheets/style.css" ] filePath = Path.join __dirname, "../../../", "public#{path}" diff --git a/services/web/app/views/project/editor.jade b/services/web/app/views/project/editor.jade index 8a3c1aae27..d1a45417c5 100644 --- a/services/web/app/views/project/editor.jade +++ b/services/web/app/views/project/editor.jade @@ -102,13 +102,13 @@ block content "paths" : { "mathjax": "#{buildJsPath('/libs/mathjax/MathJax.js', {cdn:false, fingerprint:false, qs:{config:'TeX-AMS_HTML'}})}", "moment": "libs/moment-2.7.0", - "libs/pdf": "libs/pdfjs-1.3.91/pdf" + "libs/pdf": "libs/pdfjs-1.3.91p1/pdf", }, "urlArgs" : "fingerprint=#{fingerprint(jsPath + 'ide.js')}-#{fingerprint(jsPath + 'libs.js')}", "waitSeconds": 0, "shim": { "libs/pdf": { - deps: ["libs/pdfjs-1.3.91/compatibility"] + deps: ["libs/pdfjs-1.3.91p1/compatibility"] }, "ace/ext-searchbox": { deps: ["ace/ace"] @@ -127,7 +127,7 @@ block content - locals.suppressDefaultJs = true - - var pdfPath = 'libs/pdfjs-1.3.91/pdf.worker.js' + - var pdfPath = 'libs/pdfjs-1.3.91p1/pdf.worker.js' - var fingerprintedPath = fingerprint(jsPath+pdfPath) - var pdfJsWorkerPath = buildJsPath(pdfPath, {cdn:false,qs:{fingerprint:fingerprintedPath}}) // don't use worker for cdn