commit 7cd5d13a6716096eb760ee509c83db58c6518fa7
author Renan Oliveira <renanoliveira@google.com> Wed Jun 02 13:42:46 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 02 13:42:46 2021 +0000
tree 35232bf2d6c8bcf0d3f8b15e49d2bd1e3820ae05
parent 79c8fc066718ec607050c9eb6864720b2990efed
parent ef28fefa08e7fbaa36ad264152eacf49d0ba439e

Merge "Fix merge of gr-diff-cursor."

polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor.ts

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor.ts b/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor.ts
index 010786f..68bdaa6 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor.ts
@@ -55,8 +55,21 @@
   private preventAutoScrollOnManualScroll = false;
 
   set side(side: Side) {
+    if (this.sideInternal === side) {
+      return;
+    }
+    if (this.sideInternal && this.diffRow) {
+      this.fireCursorMoved(
+        'line-cursor-moved-out',
+        this.diffRow,
+        this.sideInternal
+      );
+    }
     this.sideInternal = side;
     this.updateSideClass();
+    if (this.diffRow) {
+      this.fireCursorMoved('line-cursor-moved-in', this.diffRow, this.side);
+    }
   }
 
   get side(): Side {
@@ -478,19 +491,6 @@
     toggleClass(this.diffRow, RIGHT_SIDE_CLASS, this.side === Side.RIGHT);
   }
 
-  _updateSide(_: Side, oldSide: Side) {
-    if (!this.diffRow) {
-      return;
-    }
-    if (oldSide) {
-      this.fireCursorMoved('line-cursor-moved-out', this.diffRow, oldSide);
-    }
-    this.updateSideClass();
-    if (this.diffRow) {
-      this.fireCursorMoved('line-cursor-moved-in', this.diffRow, this.side);
-    }
-  }
-
   _isActionType(type: GrDiffRowType) {
     return (
       type !== GrDiffLineType.BLANK && type !== GrDiffGroupType.CONTEXT_CONTROL