Merge "Increase initial number of files shown to 200"
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
index cec9487..cbe5dad 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
@@ -465,7 +465,8 @@
project-config="[[_projectConfig]]"
selected-index="{{viewState.selectedFileIndex}}"
diff-view-mode="{{viewState.diffMode}}"
- num-files-shown="{{_numFilesShown}}"></gr-file-list>
+ num-files-shown="{{_numFilesShown}}"
+ file-list-increment="{{_numFilesShown}}"></gr-file-list>
</section>
<gr-messages-list id="messageList"
change-num="[[_changeNum]]"
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index 8ce7a83..e576a71 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -22,7 +22,7 @@
var COMMENT_SAVE = 'Saving... Try again after all comments are saved.';
var MIN_LINES_FOR_COMMIT_COLLAPSE = 30;
- var DEFAULT_NUM_FILES_SHOWN = 75;
+ var DEFAULT_NUM_FILES_SHOWN = 200;
// Maximum length for patch set descriptions.
var PATCH_DESC_MAX_LENGTH = 500;
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
index 3534808..5b27b72 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
@@ -374,8 +374,8 @@
};
element.viewState.changeNum = null;
element.viewState.diffMode = 'UNIFIED';
- assert.equal(element.viewState.numFilesShown, 75);
- assert.equal(element._numFilesShown, 75);
+ assert.equal(element.viewState.numFilesShown, 200);
+ assert.equal(element._numFilesShown, 200);
element._numFilesShown = 150;
flushAsynchronousOperations();
assert.equal(element.viewState.diffMode, 'UNIFIED');
@@ -394,8 +394,8 @@
flushAsynchronousOperations();
assert.isNull(element.viewState.diffMode);
assert.equal(element.viewState.changeNum, '2');
- assert.equal(element.viewState.numFilesShown, 75);
- assert.equal(element._numFilesShown, 75);
+ assert.equal(element.viewState.numFilesShown, 200);
+ assert.equal(element._numFilesShown, 200);
});
test('patch num change', function(done) {
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
index 34a551c..f1ce0ca 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
@@ -80,11 +80,7 @@
type: Object,
computed: '_calculatePatchChange(_files)',
},
- _fileListIncrement: {
- type: Number,
- readOnly: true,
- value: 75,
- },
+ fileListIncrement: Number,
_hideChangeTotals: {
type: Boolean,
computed: '_shouldHideChangeTotals(_patchChange)',
@@ -702,7 +698,7 @@
},
_incrementNumFilesShown: function() {
- this.numFilesShown += this._fileListIncrement;
+ this.numFilesShown += this.fileListIncrement;
},
_computeFileListButtonHidden: function(numFilesShown, files) {
@@ -712,7 +708,7 @@
_computeIncrementText: function(numFilesShown, files) {
if (!files) { return ''; }
var text =
- Math.min(this._fileListIncrement, files.length - numFilesShown);
+ Math.min(this.fileListIncrement, files.length - numFilesShown);
return 'Show ' + text + ' more';
},
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.html b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.html
index c006f68..2f4b1ab 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.html
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.html
@@ -60,7 +60,7 @@
reload: function() { return Promise.resolve(); },
});
element = fixture('basic');
- element.numFilesShown = 75;
+ element.numFilesShown = 200;
saveStub = sandbox.stub(element, '_saveReviewedState',
function() { return Promise.resolve(); });
});
@@ -69,6 +69,15 @@
sandbox.restore();
});
+ test('correct number of files are shown', function() {
+ element._files = _.times(500, function(i) {
+ return {__path: '/file' + i, lines_inserted: 9}; });
+ flushAsynchronousOperations();
+ assert.equal(
+ Polymer.dom(element.root).querySelectorAll('.file-row').length,
+ element.numFilesShown);
+ });
+
test('get file list', function(done) {
var getChangeFilesStub = sandbox.stub(element.$.restAPI, 'getChangeFiles',
function() {
