Merge pull request #8996 from overleaf/msm-ce-sp-hotfix-3-1-1

[CE/SP] Hotfix 3.1.1

GitOrigin-RevId: f1c3feb17e90f9cd1050b7a2b4ad18e7db9a8ed3
This commit is contained in:
Miguel Serrano 2022-08-04 09:12:48 +02:00 committed by Copybot
parent 88a1935180
commit ab4a01f15b
2 changed files with 27 additions and 0 deletions

View file

@ -0,0 +1,11 @@
FROM sharelatex/sharelatex:3.1.0
# Patch: fixes Sharelatex History navigation
# https://github.com/overleaf/overleaf/issues/1035
COPY fix-history-navigation.patch .
RUN patch -p0 < fix-history-navigation.patch
# Rebuild client
# --------------
RUN node genScript compile | bash

View file

@ -0,0 +1,16 @@
--- services/web/frontend/js/ide/history/controllers/HistoryListController.js
+++ services/web/frontend/js/ide/history/controllers/HistoryListController.js
@@ -62,7 +62,12 @@ App.controller('HistoryListController', function ($scope, $modal, ide) {
return (() => {
const result = []
for (const update of Array.from($scope.history.updates)) {
- let inSelection
+
+ // replacing this declaration with `let` introduces a bug in history point selection:
+ // https://github.com/overleaf/overleaf/issues/1035
+ // eslint-disable-next-line no-var
+ var inSelection
+
if (update.selectedTo) {
inSelection = true
beforeSelection = false