Merge pull request #2037 from overleaf/hb-detect-changes-pre-export

Detect for uncompiled changes before export

GitOrigin-RevId: a8b044c79ea4a6678388130d5ce77a05693c2d60

services/web/app/views/project/editor/pdf.pug

@@ -1,5 +1,5 @@
 div.full-size.pdf(ng-controller="PdfController")
-	.toolbar.toolbar-pdf(ng-class="{ 'uncompiled-changes': uncompiledChanges && !autoCompileLintingError }")
+	.toolbar.toolbar-pdf(ng-class="{ 'changes-to-autocompile': changesToAutoCompile && !autoCompileLintingError }")
 		.btn-group.btn-recompile-group#recompile(
 			dropdown,
 			tooltip-html="'"+translate('recompile_pdf')+" <span class=\"keyboard-shortcut\">({{modifierKey}} + Enter)</span>'"
@@ -93,7 +93,7 @@ div.full-size.pdf(ng-controller="PdfController")
 			
 		.toolbar-right
 			span.auto-compile-status.small(
-				ng-show="uncompiledChanges && !compiling && !autoCompileLintingError"
+				ng-show="changesToAutoCompile && !compiling && !autoCompileLintingError"
 			) #{translate('uncompiled_changes')}
 			span.auto-compile-status.auto-compile-error.small(
 				ng-show="autoCompileLintingError"

services/web/public/src/ide/pdf/controllers/PdfController.js

@@ -194,32 +194,32 @@ define([
       return (autoCompileInterval = null)
     }
 
-    $scope.$watch('uncompiledChanges', function(uncompiledChanges) {
-      if (uncompiledChanges) {
+    $scope.changesToAutoCompile = false
+    $scope.$watch('pdf.uncompiled', function(uncompiledChanges) {
+      // don't autocompile if disabled or the pdf is not visible
+      if (
+        $scope.pdf.uncompiled &&
+        $scope.autocompile_enabled &&
+        !$scope.ui.pdfHidden
+      ) {
+        $scope.changesToAutoCompile = true
         return startTryingAutoCompile()
       } else {
+        $scope.changesToAutoCompile = false
         return stopTryingAutoCompile()
       }
     })
 
-    $scope.uncompiledChanges = false
     const recalculateUncompiledChanges = function() {
-      if (!$scope.autocompile_enabled) {
-        // Auto-compile was disabled
-        $scope.uncompiledChanges = false
-      }
-      if ($scope.ui.pdfHidden) {
-        // Don't bother auto-compiling if pdf isn't visible
-        return ($scope.uncompiledChanges = false)
-      } else if ($scope.docLastChangedAt == null) {
-        return ($scope.uncompiledChanges = false)
+      if ($scope.docLastChangedAt == null) {
+        $scope.pdf.uncompiled = false
       } else if (
         $scope.lastStartedCompileAt == null ||
         $scope.docLastChangedAt > $scope.lastStartedCompileAt
       ) {
-        return ($scope.uncompiledChanges = true)
+        $scope.pdf.uncompiled = true
       } else {
-        return ($scope.uncompiledChanges = false)
+        $scope.pdf.uncompiled = false
       }
     }
 
@@ -241,39 +241,24 @@ define([
 
     const onCompilingStateChanged = compiling => recalculateUncompiledChanges()
 
-    let autoCompileListeners = []
-    const toggleAutoCompile = function(enabling) {
-      if (enabling) {
-        return (autoCompileListeners = [
-          ide.$scope.$on('doc:changed', onDocChanged),
-          ide.$scope.$on('doc:saved', onDocSaved),
-          $scope.$watch('pdf.compiling', onCompilingStateChanged)
-        ])
-      } else {
-        for (let unbind of Array.from(autoCompileListeners)) {
-          unbind()
-        }
-        autoCompileListeners = []
-        return ($scope.autoCompileLintingError = false)
-      }
-    }
+    ide.$scope.$on('doc:changed', onDocChanged)
+    ide.$scope.$on('doc:saved', onDocSaved)
+    $scope.$watch('pdf.compiling', onCompilingStateChanged)
 
     $scope.autocompile_enabled =
       localStorage(`autocompile_enabled:${$scope.project_id}`) || false
     $scope.$watch('autocompile_enabled', function(newValue, oldValue) {
       if (newValue != null && oldValue !== newValue) {
+        if (newValue === true) {
+          startTryingAutoCompile()
+        }
         localStorage(`autocompile_enabled:${$scope.project_id}`, newValue)
-        toggleAutoCompile(newValue)
         return event_tracking.sendMB('autocompile-setting-changed', {
           value: newValue
         })
       }
     })
 
-    if ($scope.autocompile_enabled) {
-      toggleAutoCompile(true)
-    }
-
     // abort compile if syntax checks fail
     $scope.stop_on_validation_error = localStorage(
       `stop_on_validation_error:${$scope.project_id}`

services/web/public/stylesheets/app/editor/pdf.less

@@ -8,7 +8,7 @@
 	.toolbar-small-mixin;
 	.toolbar-alt-mixin;
 	padding-right: 5px;
-	&.uncompiled-changes {
+	&.changes-to-autocompile {
 		#gradient > .striped(@color: rgba(255,255,255,.10), @angle: -45deg);
 		background-size: @stripe-width @stripe-width;
 		.animation(pdf-toolbar-stripes 2s linear infinite);