| Index: ui/file_manager/file_manager/foreground/js/file_table.js
|
| diff --git a/ui/file_manager/file_manager/foreground/js/file_table.js b/ui/file_manager/file_manager/foreground/js/file_table.js
|
| index 9f4bb016670938a892d60e49a634730eafdf2c19..086a4b8ef13e1ea335b1a7422447bbf9159dcd5e 100644
|
| --- a/ui/file_manager/file_manager/foreground/js/file_table.js
|
| +++ b/ui/file_manager/file_manager/foreground/js/file_table.js
|
| @@ -476,8 +476,8 @@ FileTable.prototype.updateSize_ = function(div, entry) {
|
| return;
|
| } else if (filesystemProps.size === 0 &&
|
| FileType.isHosted(entry)) {
|
| - var driveProps = this.metadataCache_.getCached(entry, 'drive');
|
| - if (!driveProps) {
|
| + var externalProps = this.metadataCache_.getCached(entry, 'external');
|
| + if (!externalProps) {
|
| var locationInfo = this.volumeManager_.getLocationInfo(entry);
|
| if (locationInfo && locationInfo.isDriveBased) {
|
| // Should not reach here, since we already have size metadata.
|
| @@ -485,7 +485,7 @@ FileTable.prototype.updateSize_ = function(div, entry) {
|
| div.textContent = '...';
|
| return;
|
| }
|
| - } else if (driveProps.hosted) {
|
| + } else if (externalProps.hosted) {
|
| div.textContent = '--';
|
| return;
|
| }
|
| @@ -602,11 +602,11 @@ FileTable.prototype.updateListItemsMetadata = function(type, entries) {
|
| forEachCell('.table-row-cell > .size', function(item, entry, unused) {
|
| this.updateSize_(item, entry);
|
| });
|
| - } else if (type === 'drive') {
|
| + } else if (type === 'external') {
|
| // The cell name does not matter as the entire list item is needed.
|
| forEachCell('.table-row-cell > .date', function(item, entry, listItem) {
|
| - var props = this.metadataCache_.getCached(entry, 'drive');
|
| - filelist.updateListItemDriveProps(listItem, props);
|
| + var props = this.metadataCache_.getCached(entry, 'external');
|
| + filelist.updateListItemExternalProps(listItem, props);
|
| });
|
| }
|
| };
|
| @@ -679,10 +679,10 @@ filelist.decorateListItem = function(li, entry, metadataCache) {
|
| li.classList.add(entry.isDirectory ? 'directory' : 'file');
|
| // The metadata may not yet be ready. In that case, the list item will be
|
| // updated when the metadata is ready via updateListItemsMetadata. For files
|
| - // not on Drive, driveProps is not available.
|
| - var driveProps = metadataCache.getCached(entry, 'drive');
|
| - if (driveProps)
|
| - filelist.updateListItemDriveProps(li, driveProps);
|
| + // not on an external backend, externalProps is not available.
|
| + var externalProps = metadataCache.getCached(entry, 'external');
|
| + if (externalProps)
|
| + filelist.updateListItemExternalProps(li, externalProps);
|
|
|
| // Overriding the default role 'list' to 'listbox' for better
|
| // accessibility on ChromeOS.
|
| @@ -729,13 +729,13 @@ filelist.renderFileNameLabel = function(doc, entry) {
|
| };
|
|
|
| /**
|
| - * Updates grid item or table row for the driveProps.
|
| + * Updates grid item or table row for the externalProps.
|
| * @param {cr.ui.ListItem} li List item.
|
| - * @param {Object} driveProps Metadata.
|
| + * @param {Object} externalProps Metadata.
|
| */
|
| -filelist.updateListItemDriveProps = function(li, driveProps) {
|
| +filelist.updateListItemExternalProps = function(li, externalProps) {
|
| if (li.classList.contains('file')) {
|
| - if (driveProps.availableOffline)
|
| + if (externalProps.availableOffline)
|
| li.classList.remove('dim-offline');
|
| else
|
| li.classList.add('dim-offline');
|
| @@ -748,11 +748,11 @@ filelist.updateListItemDriveProps = function(li, driveProps) {
|
| if (!iconDiv)
|
| return;
|
|
|
| - if (driveProps.customIconUrl)
|
| - iconDiv.style.backgroundImage = 'url(' + driveProps.customIconUrl + ')';
|
| + if (externalProps.customIconUrl)
|
| + iconDiv.style.backgroundImage = 'url(' + externalProps.customIconUrl + ')';
|
| else
|
| iconDiv.style.backgroundImage = ''; // Back to the default image.
|
|
|
| if (li.classList.contains('directory'))
|
| - iconDiv.classList.toggle('shared', driveProps.shared);
|
| + iconDiv.classList.toggle('shared', externalProps.shared);
|
| };
|
|
|