commit dc2c445bc1c99280ab77814fee4b882382a6f9bc
author Paladox none <thomasmulhall410@yahoo.com> Fri Apr 29 09:25:52 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 29 09:25:52 2022 +0000
tree 44e234d26b3675544efd74d9577fc0b889ce5f44
parent 5809c981928f7839f80e94f81306542b9a767ac2
parent 2b8952e6539b288f89a0104c2a61a53b0233ba0d

Merge "Use correct type for diffPrefs.ignore_whitespace" into stable-3.6

polygerrit-ui/app/elements/shared/gr-diff-preferences/gr-diff-preferences.ts

diff --git a/polygerrit-ui/app/elements/shared/gr-diff-preferences/gr-diff-preferences.ts b/polygerrit-ui/app/elements/shared/gr-diff-preferences/gr-diff-preferences.ts
index de12c98..5fd7db4 100644
--- a/polygerrit-ui/app/elements/shared/gr-diff-preferences/gr-diff-preferences.ts
+++ b/polygerrit-ui/app/elements/shared/gr-diff-preferences/gr-diff-preferences.ts
@@ -307,14 +307,14 @@
       this.originalDiffPrefs?.line_length !== this.diffPrefs?.line_length ||
       this.originalDiffPrefs?.tab_size !== this.diffPrefs?.tab_size ||
       this.originalDiffPrefs?.font_size !== this.diffPrefs?.font_size ||
+      this.originalDiffPrefs?.ignore_whitespace !==
+        this.diffPrefs?.ignore_whitespace ||
       Boolean(this.originalDiffPrefs?.show_tabs) !==
         Boolean(this.diffPrefs?.show_tabs) ||
       Boolean(this.originalDiffPrefs?.show_whitespace_errors) !==
         Boolean(this.diffPrefs?.show_whitespace_errors) ||
       Boolean(this.originalDiffPrefs?.manual_review) !==
-        Boolean(this.diffPrefs?.manual_review) ||
-      Boolean(this.originalDiffPrefs?.ignore_whitespace) !==
-        Boolean(this.diffPrefs?.ignore_whitespace)
+        Boolean(this.diffPrefs?.manual_review)
     );
   }