From 0eaa359f6c17fabab2cfb3ed20e6119007c17e2f Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Thu, 15 Sep 2016 14:16:28 +0100 Subject: [PATCH] use syntax validator for beta programme users only --- services/web/app/views/project/editor.jade | 2 +- .../public/coffee/ide/editor/directives/aceEditor.coffee | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/web/app/views/project/editor.jade b/services/web/app/views/project/editor.jade index df854115fc..b5463c647d 100644 --- a/services/web/app/views/project/editor.jade +++ b/services/web/app/views/project/editor.jade @@ -130,7 +130,7 @@ block content - 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 - - var aceWorkerPath = buildJsPath("ace", {cdn:false,fingerprint:false}) // don't use worker for cdn + - var aceWorkerPath = user.betaProgram ? buildJsPath("ace", {cdn:false,fingerprint:false}) : "" // don't use worker for cdn script(type='text/javascript'). window.pdfJsWorkerPath = "#{pdfJsWorkerPath}"; diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee index 30c08b9fb4..0e8878e7b9 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee @@ -11,8 +11,10 @@ define [ EditSession = ace.require('ace/edit_session').EditSession # set the path for ace workers if using a CDN (from editor.jade) - if window.aceWorkerPath? - ace.config.set('workerPath', "#{window.aceWorkerPath}"); + if window.aceWorkerPath != "" + ace.config.set('workerPath', "#{window.aceWorkerPath}") + else + ace.config.setDefaultValue("session", "useWorker", false) # Ace loads its script itself, so we need to hook in to be able to clear # the cache.