From 9f1adfd0c0b5bbe8157f6f70ec4be474780454af Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Mon, 4 Sep 2017 11:41:52 +0100 Subject: [PATCH] Replace separate autocompile ctrl with listener in PdfController --- services/web/app/views/project/editor/pdf.pug | 1 - services/web/public/coffee/ide/pdf/PdfManager.coffee | 3 +-- .../ide/pdf/controllers/AutoCompileController.coffee | 9 --------- .../coffee/ide/pdf/controllers/PdfController.coffee | 5 +++++ 4 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 services/web/public/coffee/ide/pdf/controllers/AutoCompileController.coffee diff --git a/services/web/app/views/project/editor/pdf.pug b/services/web/app/views/project/editor/pdf.pug index 5cc360afe1..960d4bf2c9 100644 --- a/services/web/app/views/project/editor/pdf.pug +++ b/services/web/app/views/project/editor/pdf.pug @@ -1,5 +1,4 @@ div.full-size.pdf(ng-controller="PdfController") - .FIXME(ng-controller="AutoCompileController") .toolbar.toolbar-tall .btn-group( dropdown, diff --git a/services/web/public/coffee/ide/pdf/PdfManager.coffee b/services/web/public/coffee/ide/pdf/PdfManager.coffee index 871257031a..56fe7b1e68 100644 --- a/services/web/public/coffee/ide/pdf/PdfManager.coffee +++ b/services/web/public/coffee/ide/pdf/PdfManager.coffee @@ -1,8 +1,7 @@ define [ "ide/pdf/controllers/PdfController" "ide/pdf/controllers/PdfViewToggleController" - "ide/pdfng/directives/pdfJs", - "ide/pdf/controllers/AutoCompileController" + "ide/pdfng/directives/pdfJs" ], () -> class PdfManager constructor: (@ide, @$scope) -> diff --git a/services/web/public/coffee/ide/pdf/controllers/AutoCompileController.coffee b/services/web/public/coffee/ide/pdf/controllers/AutoCompileController.coffee deleted file mode 100644 index 7e28153262..0000000000 --- a/services/web/public/coffee/ide/pdf/controllers/AutoCompileController.coffee +++ /dev/null @@ -1,9 +0,0 @@ -define [ - "base" -], (App) -> - App.controller "AutoCompileController", ["$scope", "ide", ($scope, ide) -> - ide.$scope.$on "ide:opAcknowledged", _.debounce(() -> - if (!ide.$scope.hasLintingError) - $scope.recompile() - , 3000) - ] \ No newline at end of file diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 42c1cd1bc8..23770faef7 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -73,6 +73,11 @@ define [ $scope.pdf.view = 'errors' $scope.pdf.renderingError = true + ide.$scope.$on "ide:opAcknowledged", _.debounce(() -> + if (!ide.$scope.hasLintingError) + $scope.recompile() + , 3000) + # abort compile if syntax checks fail $scope.stop_on_validation_error = localStorage("stop_on_validation_error:#{$scope.project_id}") $scope.stop_on_validation_error ?= true # turn on for all users by default