From 357617d952f15dfb679470fa6e6d19a416899601 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 13 Dec 2017 14:19:19 +0000 Subject: [PATCH] works with libs compiled into it --- services/web/Gruntfile.coffee | 5 ++--- services/web/app/views/project/editor.pug | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/services/web/Gruntfile.coffee b/services/web/Gruntfile.coffee index c49add4a91..374177e7d2 100644 --- a/services/web/Gruntfile.coffee +++ b/services/web/Gruntfile.coffee @@ -205,11 +205,10 @@ module.exports = (grunt) -> modules: [ { name: "main", - exclude: ["libs"] }, { name: "ide", - exclude: ["libs", "pdfjs-dist/build/pdf"] - }, { + exclude: ["pdfjs-dist/build/pdf"] + },{ name: "libs" },{ name: "ace/mode-latex" diff --git a/services/web/app/views/project/editor.pug b/services/web/app/views/project/editor.pug index a37ac6e6d5..19b2478f48 100644 --- a/services/web/app/views/project/editor.pug +++ b/services/web/app/views/project/editor.pug @@ -132,7 +132,7 @@ block requirejs "pdfjs-dist/build/pdf.worker": "#{pdfWorkerPath}", "ace": "#{lib('ace')}", "fineuploader": "libs/#{lib('fineuploader')}", - "ide": "#{buildJsPath('ide.js', {hashedPath:true, fingerprint:false}).slice(0,-3)}", + "ide": "#{buildJsPath('ide.js', {hashedPath:true, fingerprint:false, removeExtension:true})}" }, "urlArgs" : "fingerprint=#{fingerprint(jsPath + 'ide.js')}-#{fingerprint(jsPath + 'libs.js')}", @@ -163,7 +163,7 @@ block requirejs window.uiConfig = JSON.parse('!{JSON.stringify(uiConfig).replace(/\//g, "\\/")}'); script( - data-main=buildJsPath("ide.js", {hashedPath:false}), + data-main=buildJsPath("ide.js", {hashedPath:false, fingerprint:false}), baseurl=fullJsPath, data-ace-base=buildJsPath(lib('ace'), {fingerprint:false}), src=buildJsPath('libs/require.js', {hashedPath:true})