Commit aefeda82 authored by Naoki Fukino's avatar Naoki Fukino Committed by Commit Bot

Use let/const in ui/file_manager/file_manager/foreground/js.

Following errors are not automatically fixed by eslint.
I fixed these manually.

ui/file_manager/file_manager/foreground/js/import_controller.js
  6:1  error  Unexpected var, use let or const instead  no-var
ui/file_manager/file_manager/foreground/js/metadata/image_parsers.js
  180:9  error  Unexpected var, use let or const instead  no-var
  193:9  error  Unexpected var, use let or const instead  no-var
ui/file_manager/file_manager/foreground/js/ui/file_table.js
  131:10  error  Unexpected var, use let or const instead  no-var
ui/file_manager/file_manager/foreground/js/ui/file_tap_handler.js
  111:9  error  Unexpected var, use let or const instead  no-var
  139:9  error  Unexpected var, use let or const instead  no-var

Bug: 778674
Test: Ran browser_tests/closure_compiler
Change-Id: I77ddedbc46f3ac5d63f29836156b5e584e2a7fa0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2014620
Commit-Queue: Noel Gordon <noel@chromium.org>
Auto-Submit: Naoki Fukino <fukino@chromium.org>
Reviewed-by: default avatarNoel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734173}
parent 8353aba8
......@@ -233,7 +233,7 @@ class ActionsController {
}
// If it's still initializing, return the cached promise.
let promise = this.initializingdModels_.get(key);
const promise = this.initializingdModels_.get(key);
if (promise) {
return promise;
}
......
......@@ -796,7 +796,7 @@ class DirectoryContents extends cr.EventTarget {
}
const addedList = [];
for (let url in updatedMap) {
for (const url in updatedMap) {
addedList.push(updatedMap[url]);
}
......
......@@ -599,7 +599,7 @@ class DirectoryModel extends cr.EventTarget {
// Clear metadata information for the old (no longer visible) items in the
// file list.
const fileList = this.getFileList();
let removedUrls = [];
const removedUrls = [];
for (let i = 0; i < fileList.length; i++) {
removedUrls.push(fileList.item(i).toURL());
}
......@@ -1212,7 +1212,7 @@ class DirectoryModel extends cr.EventTarget {
// its contents.
const currentDir = this.getCurrentDirEntry();
const affectedVolumes = event.added.concat(event.removed);
for (let volume of affectedVolumes) {
for (const volume of affectedVolumes) {
if (util.isSameEntry(currentDir, volume.prefixEntry)) {
this.rescan(false);
break;
......
......@@ -49,9 +49,9 @@ function makeSimpleFileListModel(names) {
function createFakeMetadataModel(data) {
return /** @type {!MetadataModel} */ ({
getCache: (entries, names) => {
let result = [];
const result = [];
for (let i = 0; i < entries.length; i++) {
let metadata = {};
const metadata = {};
if (!entries[i].isDirectory && data[entries[i].name]) {
for (let j = 0; j < names.length; j++) {
metadata[names[j]] = data[entries[i].name][names[j]];
......
......@@ -913,11 +913,11 @@ class FileTasks {
* @param {!Array<!chrome.fileManagerPrivate.FileTask>} tasks
*/
updateShareMenuButton_(shareMenuButton, tasks) {
let driveShareCommand =
const driveShareCommand =
shareMenuButton.menu.querySelector('cr-menu-item[command="#share"]');
let driveShareCommandSeparator =
const driveShareCommandSeparator =
shareMenuButton.menu.querySelector('#drive-share-separator');
let moreActionsSeparator =
const moreActionsSeparator =
shareMenuButton.menu.querySelector('#more-actions-separator');
// Update share command.
......@@ -938,7 +938,7 @@ class FileTasks {
// Temporarily remove the more actions item while the rest of the menu
// items are being cleared out so we don't lose it and make it hidden for
// now
let moreActions = shareMenuButton.menu.querySelector(
const moreActions = shareMenuButton.menu.querySelector(
'cr-menu-item[command="#show-submenu"]');
moreActions.remove();
moreActions.setAttribute('hidden', '');
......
......@@ -3,6 +3,7 @@
// found in the LICENSE file.
// Namespace
// eslint-disable-next-line
var importer = importer || {};
/** @private @enum {string} */
......
......@@ -12,7 +12,7 @@ function writeDirectory_(bytes, tag) {
assertEquals(2, tag.format);
assertTrue(tag.componentCount > 4);
let byteWriter = new ByteWriter(bytes.buffer, 0);
const byteWriter = new ByteWriter(bytes.buffer, 0);
byteWriter.writeScalar(1, 2); // Number of fields.
byteWriter.writeScalar(tag.id, 2);
......@@ -59,8 +59,8 @@ class ConsoleLogger {
function parseExifData_(bytes) {
const exifParser = new ExifParser(new ConsoleLogger());
let tags = {};
let byteReader = new ByteReader(bytes.buffer);
const tags = {};
const byteReader = new ByteReader(bytes.buffer);
assertEquals(0, exifParser.readDirectory(byteReader, tags));
return tags;
}
......@@ -70,7 +70,7 @@ function parseExifData_(bytes) {
*/
function testWithoutNullCharacterTermination() {
// Create exif with a value that does not end with null character.
let data = new Uint8Array(0x10000);
const data = new Uint8Array(0x10000);
writeDirectory_(data, /** @type {!ExifEntry} */ ({
id: 0x10f, // Manufacturer Id.
format: 2, // String format.
......
......@@ -177,9 +177,11 @@ class WebpParser extends SimpleImageParser {
throw new Error(
'Invalid VP8 lossy bitstream signature: ' + lossySignature);
}
var dimensionBits = br.readScalar(4);
{
const dimensionBits = br.readScalar(4);
metadata.width = dimensionBits & 0x3fff;
metadata.height = (dimensionBits >> 16) & 0x3fff;
}
break;
// VP8 lossless bitstream format.
......@@ -190,9 +192,11 @@ class WebpParser extends SimpleImageParser {
throw new Error(
'Invalid VP8 lossless bitstream signature: ' + losslessSignature);
}
var dimensionBits = br.readScalar(4);
{
const dimensionBits = br.readScalar(4);
metadata.width = (dimensionBits & 0x3fff) + 1;
metadata.height = ((dimensionBits >> 14) & 0x3fff) + 1;
}
break;
// VP8 extended file format.
......
......@@ -62,12 +62,12 @@ class MetadataCacheItem {
storeProperties(requestId, typedObject) {
let changed = false;
const object = /** @type {!Object} */ (typedObject);
for (let name in object) {
for (const name in object) {
if (/.Error$/.test(name) && object[name]) {
object[name.substr(0, name.length - 5)] = undefined;
}
}
for (let name in object) {
for (const name in object) {
if (/.Error$/.test(name)) {
continue;
}
......
......@@ -5,7 +5,7 @@
/**
* @type {!MetadataItem}
*/
let metadataA = new MetadataItem();
const metadataA = new MetadataItem();
metadataA.contentMimeType = 'value';
......@@ -50,7 +50,7 @@ function testMetadataCacheItemStoreInReverseOrder() {
item.startRequests(1, item.createRequests(['contentMimeType']));
item.startRequests(2, item.createRequests(['contentMimeType']));
let metadataB = new MetadataItem();
const metadataB = new MetadataItem();
metadataB.contentMimeType = 'value2';
assertTrue(item.storeProperties(2, metadataB));
......@@ -81,7 +81,7 @@ function testMetadataCacheItemHasFreshCache() {
item.startRequests(
1, item.createRequests(['contentMimeType', 'externalFileUrl']));
let metadata = new MetadataItem();
const metadata = new MetadataItem();
metadata.contentMimeType = 'mime';
metadata.externalFileUrl = 'url';
......@@ -102,7 +102,7 @@ function testMetadataCacheItemShouldNotUpdateBeforeInvalidation() {
item.startRequests(1, item.createRequests(['contentMimeType']));
item.storeProperties(1, metadataA);
let metadataB = new MetadataItem();
const metadataB = new MetadataItem();
metadataB.contentMimeType = 'value2';
item.storeProperties(2, metadataB);
......@@ -113,11 +113,11 @@ function testMetadataCacheItemError() {
const item = new MetadataCacheItem();
item.startRequests(1, item.createRequests(['contentThumbnailUrl']));
let metadataWithError = new MetadataItem();
const metadataWithError = new MetadataItem();
metadataWithError.contentThumbnailUrlError = new Error('Error');
item.storeProperties(1, metadataWithError);
let property = item.get(['contentThumbnailUrl']);
const property = item.get(['contentThumbnailUrl']);
assertEquals(undefined, property.contentThumbnailUrl);
assertEquals('Error', property.contentThumbnailUrlError.message);
}
......@@ -126,7 +126,7 @@ function testMetadataCacheItemErrorShouldNotFetchedDirectly() {
const item = new MetadataCacheItem();
item.startRequests(1, item.createRequests(['contentThumbnailUrl']));
let metadataWithError = new MetadataItem();
const metadataWithError = new MetadataItem();
metadataWithError.contentThumbnailUrlError = new Error('Error');
item.storeProperties(1, metadataWithError);
......
......@@ -530,7 +530,7 @@ class NavigationListModel extends cr.EventTarget {
for (const removable of removableVolumes) {
// Partitions on the same physical device share device path and drive
// label. Create keys using these two identifiers.
let key = removable.volumeInfo.devicePath + '/' +
const key = removable.volumeInfo.devicePath + '/' +
removable.volumeInfo.driveLabel;
if (!removableGroups.has(key)) {
// New key, so create a new array to hold partitions.
......
......@@ -104,10 +104,10 @@ const NOT_MOUNTED_DEVICE_PROVIDING_EXTENSION = {
};
function addProvidedVolume(volumeManager, providerId, volumeId) {
let fileSystem = new MockFileSystem(volumeId, 'filesystem:' + volumeId);
const fileSystem = new MockFileSystem(volumeId, 'filesystem:' + volumeId);
fileSystem.entries['/'] = MockDirectoryEntry.create(fileSystem, '');
let volumeInfo = new VolumeInfoImpl(
const volumeInfo = new VolumeInfoImpl(
VolumeManagerCommon.VolumeType.PROVIDED, volumeId, fileSystem,
'', // error
'', // deviceType
......@@ -133,7 +133,7 @@ function setUp() {
// Create and install a mock fileManagerPrivate API for fetching the list of
// providers. TODO(mtomasz): Add some native (non-extension) providers.
let mockChrome = {
const mockChrome = {
fileManagerPrivate: {
getProviders: function(callback) {
callback([
......@@ -152,7 +152,7 @@ function setUp() {
new MockCommandLinePrivate();
// Create and install a volume manager.
let volumeManager = new MockVolumeManager();
const volumeManager = new MockVolumeManager();
MockVolumeManager.installMockSingleton(volumeManager);
// Add provided test volumes.
......@@ -166,7 +166,7 @@ function testGetInstalledProviders(callback) {
reportPromise(
volumeManagerFactory.getInstance()
.then(volumeManager => {
let model = new ProvidersModel(volumeManager);
const model = new ProvidersModel(volumeManager);
return model.getInstalledProviders();
})
.then(providers => {
......@@ -224,7 +224,7 @@ function testGetMountableProviders(callback) {
reportPromise(
volumeManagerFactory.getInstance()
.then(volumeManager => {
let model = new ProvidersModel(volumeManager);
const model = new ProvidersModel(volumeManager);
return model.getMountableProviders();
})
.then(providers => {
......
......@@ -87,8 +87,8 @@ function setUp() {
* @return {!HTMLElement}
*/
function createElements() {
let parent = document.createElement('div');
let tree = document.createElement('div');
const parent = document.createElement('div');
const tree = document.createElement('div');
parent.appendChild(tree);
return /** @type {!HTMLElement} */ (tree);
}
......@@ -117,8 +117,8 @@ function createMockMetadataModel() {
* @return {!Array<string>} Array of label strings.
*/
function getDirectoryTreeItemLabels(directoryTree) {
let labels = [];
for (let item of directoryTree.items) {
const labels = [];
for (const item of directoryTree.items) {
labels.push(item.label);
}
return labels;
......@@ -616,11 +616,11 @@ function testAddFirstTeamDrive(callback) {
.then(() => {
fakeFileSystemURLEntries['filesystem:drive/team_drives/a'] =
MockDirectoryEntry.create(driveFileSystem, '/team_drives/a');
let event = {
const event = {
entry: fakeFileSystemURLEntries['filesystem:drive/team_drives'],
eventType: 'changed',
};
for (let listener of directoryChangedListeners) {
for (const listener of directoryChangedListeners) {
listener(event);
}
})
......@@ -677,11 +677,11 @@ function testRemoveLastTeamDrive(callback) {
});
})
.then(() => {
let event = {
const event = {
entry: fakeFileSystemURLEntries['filesystem:drive/team_drives'],
eventType: 'changed',
};
for (let listener of directoryChangedListeners) {
for (const listener of directoryChangedListeners) {
listener(event);
}
})
......@@ -723,7 +723,7 @@ function testAddFirstComputer(callback) {
directoryTree = /** @type {!DirectoryTree} */ (directoryTree);
directoryTree.redraw(true);
let driveItem = directoryTree.items[0];
const driveItem = directoryTree.items[0];
// Test that we initially do not have a Computers item under Drive, and that
// adding a filesystem "/Computers/a" results in the Computers item being
......@@ -736,11 +736,11 @@ function testAddFirstComputer(callback) {
.then(() => {
fakeFileSystemURLEntries['filesystem:drive/Computers/a'] =
MockDirectoryEntry.create(driveFileSystem, '/Computers/a');
let event = {
const event = {
entry: fakeFileSystemURLEntries['filesystem:drive/Computers'],
eventType: 'changed',
};
for (let listener of directoryChangedListeners) {
for (const listener of directoryChangedListeners) {
listener(event);
}
})
......@@ -798,11 +798,11 @@ function testRemoveLastComputer(callback) {
});
})
.then(() => {
let event = {
const event = {
entry: fakeFileSystemURLEntries['filesystem:drive/Computers'],
eventType: 'changed',
};
for (let listener of directoryChangedListeners) {
for (const listener of directoryChangedListeners) {
listener(event);
}
})
......
......@@ -119,7 +119,7 @@ class FileGrid extends cr.ui.Grid {
self.a11y = a11y;
// Force the list's ending spacer to be tall enough to allow overscroll.
let endSpacer = self.querySelector('.spacer:last-child');
const endSpacer = self.querySelector('.spacer:last-child');
if (endSpacer) {
endSpacer.classList.add('signals-overscroll');
}
......
......@@ -128,7 +128,8 @@ class FileTableColumnModel extends cr.ui.table.TableColumnModel {
* hitPosition where the horizontal position is hit in the column.
*/
getHitColumn(x) {
for (var i = 0; x >= this.columns_[i].width; i++) {
let i = 0;
for (; x >= this.columns_[i].width; i++) {
x -= this.columns_[i].width;
}
if (i >= this.columns_.length) {
......@@ -395,7 +396,7 @@ class FileTable extends cr.ui.Table {
self.a11y = a11y;
// Force the list's ending spacer to be tall enough to allow overscroll.
let endSpacer = self.querySelector('.spacer:last-child');
const endSpacer = self.querySelector('.spacer:last-child');
if (endSpacer) {
endSpacer.classList.add('signals-overscroll');
}
......
......@@ -91,7 +91,7 @@ class FileTapHandler {
*/
handleTouchEvents(event, index, callback) {
switch (event.type) {
case 'touchstart':
case 'touchstart': {
// Only track the position of the single touch. However, we detect a
// two-finger tap for opening a context menu of the target.
if (event.touches.length == 2) {
......@@ -108,7 +108,7 @@ class FileTapHandler {
// can reset this.activeTouchId_ to undefined.
// if (this.activeTouchId_ !== undefined)
// return;
var touch = event.targetTouches[0];
const touch = event.targetTouches[0];
this.activeTouchId_ = touch.identifier;
this.startTouchX_ = this.lastTouchX_ = touch.clientX;
this.startTouchY_ = this.lastTouchY_ = touch.clientY;
......@@ -130,13 +130,13 @@ class FileTapHandler {
this.hasLongPressProcessed_ = true;
}
}, FileTapHandler.LONG_PRESS_THRESHOLD_MILLISECONDS);
break;
} break;
case 'touchmove':
case 'touchmove': {
if (this.activeTouchId_ === undefined) {
break;
}
var touch = this.findActiveTouch_(event.changedTouches);
const touch = this.findActiveTouch_(event.changedTouches);
if (!touch) {
break;
}
......@@ -161,7 +161,7 @@ class FileTapHandler {
}
this.lastMoveX_ = moveX;
this.lastMoveY_ = moveY;
break;
} break;
case 'touchend':
if (!this.tapStarted_) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment