From aaebb0902d7d7bf5648690bdf3736403629d9f41 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 10 Jul 2014 14:36:04 +0100 Subject: [PATCH] Fix synctex controls with new Ace --- services/web/public/coffee/ide/directives/layout.coffee | 1 + .../public/coffee/ide/editor/directives/aceEditor.coffee | 2 +- .../coffee/ide/pdf/controllers/PdfController.coffee | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/services/web/public/coffee/ide/directives/layout.coffee b/services/web/public/coffee/ide/directives/layout.coffee index a7b9d81019..f67f5a61f4 100644 --- a/services/web/public/coffee/ide/directives/layout.coffee +++ b/services/web/public/coffee/ide/directives/layout.coffee @@ -96,5 +96,6 @@ define [ , 0 resetOpenStates() + onInternalResize() } ] \ No newline at end of file diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee index 845d92f5e5..0166bbd89e 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee @@ -91,7 +91,7 @@ define [ editor.setValue(text, -1) session = editor.getSession() session.setUseWrapMode(true) - session.setMode(new LatexMode()) + session.setMode("ace/mode/latex") scope.$watch "annotations", (annotations) -> if annotations? diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 8a0a6654ab..73c9190d49 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -229,13 +229,18 @@ define [ $scope.showControls = false else $scope.showControls = true + setTimeout () -> $scope.$digest() , 0 - $scope.syncToPdf = () -> + @cursorPosition = null + ide.$scope.$on "cursor:editor:update", (event, @cursorPosition) => + + $scope.syncToPdf = () => + return if !@cursorPosition? synctex - .syncToPdf($scope.editor.cursorPosition) + .syncToPdf(@cursorPosition) .then (highlights) -> $scope.pdf.highlights = highlights