From a862592138b70161e8f6209700974c30432cc5b1 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Thu, 11 Aug 2016 13:43:33 +0100 Subject: [PATCH 1/8] added syntax check to beta page, removed mendeley --- services/web/app/views/beta_program/opt_in.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/views/beta_program/opt_in.jade b/services/web/app/views/beta_program/opt_in.jade index c6411cb211..f54766f30d 100644 --- a/services/web/app/views/beta_program/opt_in.jade +++ b/services/web/app/views/beta_program/opt_in.jade @@ -22,7 +22,7 @@ block content ul.list-unstyled.text-center li i.fa.fa-fw.fa-book - |  #{translate("mendeley_integration")} + |  #{translate("syntax_checking")} .row.text-centered .col-md-12 if user.betaProgram From 9a399d3dd3118b6fd173b6f64df2b70eeb833eb6 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Thu, 11 Aug 2016 13:55:47 +0100 Subject: [PATCH 2/8] move "run syntax check" compile option out of beta --- services/web/app/views/project/editor/pdf.jade | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index 844f0f51dc..492f75f582 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -36,13 +36,11 @@ div.full-size.pdf(ng-controller="PdfController") i.fa.fa-fw(ng-class="{'fa-check': draft}") |  #{translate("fast")}  span.subdued [draft] - if user.betaProgram - li.dropdown-header #{translate("file_checks")} - li - a(href, ng-click="recompile({check:true})") - i.fa.fa-fw() - |  #{translate("run_syntax_check")} - span.beta-feature-badge + li.dropdown-header #{translate("file_checks")} + li + a(href, ng-click="recompile({check:true})") + i.fa.fa-fw() + |  #{translate("run_syntax_check")} a( href ng-click="stop()" From daa1d80865ed4a412cfd8b61a82abf9dfa3d0288 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Thu, 11 Aug 2016 16:46:12 +0100 Subject: [PATCH 3/8] add extra delay to gotoLine event --- services/web/public/coffee/ide/editor/EditorManager.coffee | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/web/public/coffee/ide/editor/EditorManager.coffee b/services/web/public/coffee/ide/editor/EditorManager.coffee index 64cbe1d884..be15958c37 100644 --- a/services/web/public/coffee/ide/editor/EditorManager.coffee +++ b/services/web/public/coffee/ide/editor/EditorManager.coffee @@ -46,8 +46,11 @@ define [ done = () => if options.gotoLine? - @$scope.$broadcast "editor:gotoLine", options.gotoLine, options.gotoColumn - + # allow Ace to display document before moving, delay until next tick + setTimeout () => + @$scope.$broadcast "editor:gotoLine", options.gotoLine, options.gotoColumn + ,0 + if doc.id == @$scope.editor.open_doc_id and !options.forceReopen @$scope.$apply () => done() From 7863b7cab67d8a6947b591e6c9988fcce854a726 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Thu, 11 Aug 2016 16:46:30 +0100 Subject: [PATCH 4/8] when calling gotoLine also scrollToLine to put line in view --- .../aceEditor/cursor-position/CursorPositionManager.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee index 6e238122e1..8a38c317be 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee @@ -55,4 +55,5 @@ define [], () -> gotoLine: (line, column) -> @editor.gotoLine(line, column) + @editor.scrollToLine(line,true,true) @editor.focus() From 7bec656bc28bb3b5daa2852e64dfff0262173a5b Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 15 Aug 2016 16:45:33 +0100 Subject: [PATCH 5/8] sort latex output files into order in dropdown --- .../public/coffee/ide/pdf/controllers/PdfController.coffee | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index fd133e1bc3..418a55f8a5 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -195,12 +195,17 @@ define [ qs.clsiserverid = response.clsiServerId for file in response.outputFiles if IGNORE_FILES.indexOf(file.path) == -1 + isOutputFile = file.path.match(/^output\./) $scope.pdf.outputFiles.push { # Turn 'output.blg' into 'blg file'. - name: if file.path.match(/^output\./) then "#{file.path.replace(/^output\./, "")} file" else file.path + name: if isOutputFile then "#{file.path.replace(/^output\./, "")} file" else file.path url: "/project/#{project_id}/output/#{file.path}" + createQueryString qs + main: if isOutputFile then true else false } + # sort the output files into order, main files first, then others + $scope.pdf.outputFiles.sort (a,b) -> (b.main - a.main) || a.name.localeCompare(b.name) + fetchLogs = (fileByPath, options) -> From 8d6cdb03e8bc77eed01b7a43d3cc331e5a699f1b Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 15 Aug 2016 16:46:53 +0100 Subject: [PATCH 6/8] restrict compile check options allowed options are validate/error/silent validate = only run chktex, exit status 0 error = run compilation, exit(1) if chktex fails silent = run chktex, but always do full compilation --- .../web/app/coffee/Features/Compile/CompileController.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/Features/Compile/CompileController.coffee b/services/web/app/coffee/Features/Compile/CompileController.coffee index 000465a83c..00f4a880ff 100755 --- a/services/web/app/coffee/Features/Compile/CompileController.coffee +++ b/services/web/app/coffee/Features/Compile/CompileController.coffee @@ -29,8 +29,8 @@ module.exports = CompileController = options.compiler = req.body.compiler if req.body?.draft options.draft = req.body.draft - if req.body?.check - options.check = if req.body.check is "validate" then "validate" else undefined + if req.body?.check in ['validate', 'error', 'silent'] + options.check = req.body.check logger.log {options:options, project_id:project_id, user_id:user_id}, "got compile request" CompileManager.compile project_id, user_id, options, (error, status, outputFiles, clsiServerId, limits, validationProblems) -> return next(error) if error? From 93f69ca0a2d076cae6eeea4df4a1f5af7780ea8f Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 15 Aug 2016 16:48:48 +0100 Subject: [PATCH 7/8] run chktex silently for all users --- .../web/public/coffee/ide/pdf/controllers/PdfController.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 418a55f8a5..a31a336885 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -86,7 +86,7 @@ define [ return $http.post url, { rootDoc_id: options.rootDocOverride_id or null draft: $scope.draft - check: if options.check then "validate" else null + check: if options.check then "validate" else "silent" _csrf: window.csrfToken }, {params: params} From cb4f6391a285bc9c959c6d2181dcb9be238a1db0 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 16 Aug 2016 10:59:27 +0100 Subject: [PATCH 8/8] updated comments --- services/web/public/coffee/ide/editor/EditorManager.coffee | 2 ++ .../aceEditor/cursor-position/CursorPositionManager.coffee | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/editor/EditorManager.coffee b/services/web/public/coffee/ide/editor/EditorManager.coffee index be15958c37..9c6a124f1a 100644 --- a/services/web/public/coffee/ide/editor/EditorManager.coffee +++ b/services/web/public/coffee/ide/editor/EditorManager.coffee @@ -47,6 +47,8 @@ define [ done = () => if options.gotoLine? # allow Ace to display document before moving, delay until next tick + # added delay to make this happen later that gotoStoredPosition in + # CursorPositionManager setTimeout () => @$scope.$broadcast "editor:gotoLine", options.gotoLine, options.gotoColumn ,0 diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee index 8a38c317be..fd1b2d7830 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee @@ -55,5 +55,5 @@ define [], () -> gotoLine: (line, column) -> @editor.gotoLine(line, column) - @editor.scrollToLine(line,true,true) + @editor.scrollToLine(line,true,true) # centre and animate @editor.focus()