opendev/gerrit
Code Issues Proposed changes

ES6ify /gr-path-list-behavior/*

Browse Source 
Bug: Issue 6179
Change-Id: Ia910baa88ab5776bc0f00be51c2ed7a316c84b61
This commit is contained in:
Kasper Nilsson
2017-05-14 18:07:11 -07:00
parent 7ecd5593f5
commit 0ed5b0de14
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
polygerrit-ui/app/behaviors/gr-path-list-behavior/gr-path-list-behavior.html
View File

@@ -18,10 +18,10 @@ limitations under the License.
'use strict';
/** @polymerBehavior Gerrit.PathListBehavior */
var PathListBehavior = {
specialFilePathCompare: function(a, b) {
const PathListBehavior = {
specialFilePathCompare(a, b) {
// The commit message always goes first.
var COMMIT_MESSAGE_PATH = '/COMMIT_MSG';
const COMMIT_MESSAGE_PATH = '/COMMIT_MSG';
if (a === COMMIT_MESSAGE_PATH) {
return -1;
}
@@ -30,7 +30,7 @@ limitations under the License.
}
// The merge list always comes next.
var MERGE_LIST_PATH = '/MERGE_LIST';
const MERGE_LIST_PATH = '/MERGE_LIST';
if (a === MERGE_LIST_PATH) {
return -1;
}
@@ -38,25 +38,24 @@ limitations under the License.
return 1;
}
var aLastDotIndex = a.lastIndexOf('.');
var aExt = a.substr(aLastDotIndex + 1);
var aFile = a.substr(0, aLastDotIndex) || a;
const aLastDotIndex = a.lastIndexOf('.');
const aExt = a.substr(aLastDotIndex + 1);
const aFile = a.substr(0, aLastDotIndex) || a;
var bLastDotIndex = b.lastIndexOf('.');
var bExt = b.substr(bLastDotIndex + 1);
var bFile = b.substr(0, bLastDotIndex) || b;
const bLastDotIndex = b.lastIndexOf('.');
const bExt = b.substr(bLastDotIndex + 1);
const bFile = b.substr(0, bLastDotIndex) || b;
// Sort header files above others with the same base name.
var headerExts = ['h', 'hxx', 'hpp'];
const headerExts = ['h', 'hxx', 'hpp'];
if (aFile.length > 0 && aFile === bFile) {
if (headerExts.indexOf(aExt) !== -1 &&
headerExts.indexOf(bExt) !== -1) {
if (headerExts.includes(aExt) && headerExts.includes(bExt)) {
return a.localeCompare(b);
}
if (headerExts.indexOf(aExt) !== -1) {
if (headerExts.includes(aExt)) {
return -1;
}
if (headerExts.indexOf(bExt) !== -1) {
if (headerExts.includes(bExt)) {
return 1;
}
}

22
polygerrit-ui/app/behaviors/gr-path-list-behavior/gr-path-list-behavior_test.html
View File

@@ -22,19 +22,27 @@ limitations under the License.
<link rel="import" href="gr-path-list-behavior.html">
<script>
suite('gr-path-list-behavior tests', function() {
test('special sort', function() {
var sort = Gerrit.PathListBehavior.specialFilePathCompare;
var testFiles = [
suite('gr-path-list-behavior tests', () => {
test('special sort', () => {
const sort = Gerrit.PathListBehavior.specialFilePathCompare;
const testFiles = [
'/a.h',
'/MERGE_LIST',
'/a.cpp',
'/COMMIT_MSG',
'/asdasd',
'/mrPeanutbutter.py'
'/mrPeanutbutter.py',
];
assert.deepEqual(testFiles.sort(sort),
['/COMMIT_MSG', '/MERGE_LIST', '/a.h', '/a.cpp', '/asdasd', '/mrPeanutbutter.py']);
assert.deepEqual(
testFiles.sort(sort),
[
'/COMMIT_MSG',
'/MERGE_LIST',
'/a.h',
'/a.cpp',
'/asdasd',
'/mrPeanutbutter.py',
]);
});
});
</script>