Merge changes I6ff5000a,Ia8677cf3,I55f144b9,Ideb20c47
* changes:
Remove unused property skip_uncommented
Remove unused property intraline_difference
Remove unused property auto_hide_diff_table_header
Remove unused property theme
diff --git a/polygerrit-ui/app/api/diff.ts b/polygerrit-ui/app/api/diff.ts
index 7ee68b7..bd110c8 100644
--- a/polygerrit-ui/app/api/diff.ts
+++ b/polygerrit-ui/app/api/diff.ts
@@ -162,20 +162,15 @@
export declare interface DiffPreferencesInfo {
context: number;
ignore_whitespace: IgnoreWhitespaceType;
- intraline_difference?: boolean;
line_length: number;
show_line_endings?: boolean;
show_tabs?: boolean;
show_whitespace_errors?: boolean;
- skip_uncommented?: boolean;
syntax_highlighting?: boolean;
- auto_hide_diff_table_header?: boolean;
tab_size: number;
font_size: number;
// TODO: Missing documentation
show_file_comment_button?: boolean;
- // TODO: Missing documentation
- theme?: string;
}
export declare interface RenderPreferences {
diff --git a/polygerrit-ui/app/constants/constants.ts b/polygerrit-ui/app/constants/constants.ts
index 03d5000..be502f7 100644
--- a/polygerrit-ui/app/constants/constants.ts
+++ b/polygerrit-ui/app/constants/constants.ts
@@ -403,12 +403,10 @@
// (Render mode being at least one of them).
export function createDefaultDiffPrefs(): DiffPreferencesInfo {
return {
- auto_hide_diff_table_header: true,
context: 10,
cursor_blink_rate: 0,
font_size: 12,
ignore_whitespace: 'IGNORE_NONE',
- intraline_difference: true,
line_length: 100,
line_wrapping: false,
show_line_endings: true,
@@ -416,7 +414,6 @@
show_whitespace_errors: true,
syntax_highlighting: true,
tab_size: 8,
- theme: 'DEFAULT',
};
}
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js
index 2d38dcc..285b73f 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js
@@ -1374,12 +1374,10 @@
line_length: 100,
cursor_blink_rate: 0,
line_wrapping: false,
- intraline_difference: true,
show_line_endings: true,
show_tabs: true,
show_whitespace_errors: true,
syntax_highlighting: true,
- auto_hide_diff_table_header: true,
theme: 'DEFAULT',
ignore_whitespace: 'IGNORE_NONE',
};
diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.js b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.js
index ec44f92..2215d5b 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.js
@@ -161,12 +161,10 @@
element.patchRange = {basePatchNum: 'PARENT', patchNum: 1};
element.isImageDiff = true;
element.prefs = {
- auto_hide_diff_table_header: true,
context: 10,
cursor_blink_rate: 0,
font_size: 12,
ignore_whitespace: 'IGNORE_NONE',
- intraline_difference: true,
line_length: 100,
line_wrapping: false,
show_line_endings: true,
@@ -497,12 +495,11 @@
line_length: 100,
cursor_blink_rate: 0,
line_wrapping: false,
- intraline_difference: true,
+
show_line_endings: true,
show_tabs: true,
show_whitespace_errors: true,
syntax_highlighting: true,
- auto_hide_diff_table_header: true,
theme: 'DEFAULT',
ignore_whitespace: 'IGNORE_NONE',
};
@@ -959,11 +956,10 @@
element = basicFixture.instantiate();
element.prefs = {
ignore_whitespace: ignore_whitespace || 'IGNORE_ALL',
- auto_hide_diff_table_header: true,
context: 10,
cursor_blink_rate: 0,
font_size: 12,
- intraline_difference: true,
+
line_length: 100,
line_wrapping: false,
show_line_endings: true,
diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.js
index fbd675f..7cbcaef 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.js
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.js
@@ -396,12 +396,10 @@
sinon.stub(element, 'getLoggedIn').callsFake(() => Promise.resolve(false));
return element.getDiffPreferences().then(obj => {
- assert.equal(obj.auto_hide_diff_table_header, true);
assert.equal(obj.context, 10);
assert.equal(obj.cursor_blink_rate, 0);
assert.equal(obj.font_size, 12);
assert.equal(obj.ignore_whitespace, 'IGNORE_NONE');
- assert.equal(obj.intraline_difference, true);
assert.equal(obj.line_length, 100);
assert.equal(obj.line_wrapping, false);
assert.equal(obj.show_line_endings, true);
@@ -409,7 +407,6 @@
assert.equal(obj.show_whitespace_errors, true);
assert.equal(obj.syntax_highlighting, true);
assert.equal(obj.tab_size, 8);
- assert.equal(obj.theme, 'DEFAULT');
});
});
diff --git a/polygerrit-ui/app/types/common.ts b/polygerrit-ui/app/types/common.ts
index aeacd9a..95801e7 100644
--- a/polygerrit-ui/app/types/common.ts
+++ b/polygerrit-ui/app/types/common.ts
@@ -1680,7 +1680,6 @@
context?: number;
expand_all_comments?: boolean;
ignore_whitespace: IgnoreWhitespaceType;
- intraline_difference?: boolean;
line_length?: number;
manual_review?: boolean;
retain_header?: boolean;
@@ -1688,10 +1687,8 @@
show_tabs?: boolean;
show_whitespace_errors?: boolean;
skip_deleted?: boolean;
- skip_uncommented?: boolean;
syntax_highlighting?: boolean;
hide_top_menu?: boolean;
- auto_hide_diff_table_header?: boolean;
hide_line_numbers?: boolean;
tab_size?: number;
font_size?: number;