opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  Update es6-promise polyfill to 3.3.0
  Fix duplicate lineWrapping
  Adds a new pref config called lineWrapping to Edit and Diff

Change-Id: I71434f0c54a4c72eda3a7e9e7b228d2027cd9ed8
This commit is contained in:
Paladox
2016-09-13 23:52:23 +01:00
parent e80c294223 151527a283
commit 7cf7426461
16 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/DiffPreferencesInfo.java
View File

@@ -56,6 +56,7 @@ public class DiffPreferencesInfo {
public Boolean renderEntireFile;
public Boolean hideEmptyPane;
public Boolean matchBrackets;
public Boolean lineWrapping;
public Theme theme;
public Whitespace ignoreWhitespace;
public Boolean retainHeader;
@@ -88,6 +89,7 @@ public class DiffPreferencesInfo {
i.renderEntireFile = false;
i.hideEmptyPane = false;
i.matchBrackets = false;
i.lineWrapping = false;
return i;
}
}

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/EditPreferencesInfo.java
View File

@@ -26,6 +26,7 @@ public class EditPreferencesInfo {
public Boolean syntaxHighlighting;
public Boolean hideLineNumbers;
public Boolean matchBrackets;
public Boolean lineWrapping;
public Boolean autoCloseBrackets;
public Boolean showBase;
public Theme theme;
@@ -43,6 +44,7 @@ public class EditPreferencesInfo {
i.syntaxHighlighting = true;
i.hideLineNumbers = false;
i.matchBrackets = true;
i.lineWrapping = false;
i.autoCloseBrackets = false;
i.showBase = false;
i.theme = Theme.DEFAULT;