Merge "Fix binding for visible file number"

This commit is contained in:
Wyatt Allen 2018-03-07 18:11:17 +00:00 committed by Gerrit Code Review
commit 5367f14a9e
3 changed files with 17 additions and 13 deletions
polygerrit-ui/app/elements/diff/gr-diff-view

@ -124,10 +124,12 @@ limitations under the License.
.editMode .hideOnEdit { .editMode .hideOnEdit {
display: none; display: none;
} }
.blameLoader { .blameLoader,
.fileNum {
display: none; display: none;
} }
.blameLoader.show, .blameLoader.show,
.fileNum.show ,
.download, .download,
.preferences, .preferences,
.rightControls { .rightControls {
@ -230,7 +232,7 @@ limitations under the License.
</div> </div>
</h3> </h3>
<div class="navLinks desktop"> <div class="navLinks desktop">
<span class$="fileNum [[_computeFileNumVisible(_fileNum, _formattedFiles)]]"> <span class$="fileNum [[_computeFileNumClass(_fileNum, _formattedFiles)]]">
File [[_fileNum]] of [[_formattedFiles.length]] File [[_fileNum]] of [[_formattedFiles.length]]
<span class="separator"></span> <span class="separator"></span>
</span> </span>

@ -959,14 +959,16 @@
return files.findIndex(({value}) => value === file) + 1; return files.findIndex(({value}) => value === file) + 1;
}, },
_computeFileNumVisible(file, files) { /**
if (!files) { return 'hidden'; } * @param {number} fileNum
const fileNum = this._computeFileNum(file, files); * @param {!Array<string>} files
if (!isNaN(fileNum) && isFinite(fileNum) && fileNum > 0) { * @return {string}
return ''; */
} else { _computeFileNumClass(fileNum, files) {
return 'hidden'; if (files && fileNum > 0) {
return 'show';
} }
return '';
}, },
}); });
})(); })();

@ -988,10 +988,10 @@ limitations under the License.
[{value: '/foo'}, {value: '/bar'}]), 2); [{value: '/foo'}, {value: '/bar'}]), 2);
}); });
test('_computeFileNumVisible', () => { test('_computeFileNumClass', () => {
assert.equal(element._computeFileNumVisible('', []), 'hidden'); assert.equal(element._computeFileNumClass(0, []), '');
assert.equal(element._computeFileNumVisible('/bar', assert.equal(element._computeFileNumClass(1,
[{value: '/foo'}, {value: '/bar'}]), ''); [{value: '/foo'}, {value: '/bar'}]), 'show');
}); });
suite('editMode behavior', () => { suite('editMode behavior', () => {