ui/file_manager/file_manager/foreground/js/metadata/multi_metadata_provider.js - Issue 971173002: Gallery: Start to use new metadata model in Gallery.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/file_manager/file_manager/foreground/js/metadata/multi_metadata_provider.js

Issue 971173002: Gallery: Start to use new metadata model in Gallery. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix test. Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ui/file_manager/file_manager/foreground/js/metadata/content_metadata_provider.js ('k') | ui/file_manager/file_manager/foreground/js/metadata/multi_metadata_provider_unittest.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/file_manager/file_manager/foreground/js/metadata/multi_metadata_provider.js

diff --git a/ui/file_manager/file_manager/foreground/js/metadata/multi_metadata_provider.js b/ui/file_manager/file_manager/foreground/js/metadata/multi_metadata_provider.js

index ae1a1230c0413ad3b1b8479d38fd54d8a7085fea..a6e328984f5d334313f40a150a10faa6748570fc 100644

--- a/ui/file_manager/file_manager/foreground/js/metadata/multi_metadata_provider.js

+++ b/ui/file_manager/file_manager/foreground/js/metadata/multi_metadata_provider.js

@@ -100,9 +100,12 @@ MultiMetadataProvider.prototype.get = function(requests) {

if (volumeInfo &&

(volumeInfo.volumeType === VolumeManagerCommon.VolumeType.DRIVE ||

volumeInfo.volumeType === VolumeManagerCommon.VolumeType.PROVIDED)) {

+ // Because properties can be out of sync just after sync completion

+ // even if 'dirty' is false, it refers 'present' here to switch the

+ // content and the external providers.

if (fallbackContentPropertyNames.length &&

- externalPropertyNames.indexOf('dirty') === -1) {

- externalPropertyNames.push('dirty');

+ externalPropertyNames.indexOf('present') === -1) {

+ externalPropertyNames.push('present');

}

addRequests(externalRequests, externalPropertyNames);

addRequests(contentRequests, contentPropertyNames);

@@ -133,7 +136,7 @@ MultiMetadataProvider.prototype.get = function(requests) {

var results = requestsAndResults.results;

var dirtyMap = [];

for (var i = 0; i < results.length; i++) {

- dirtyMap[requests[i].entry.toURL()] = results[i].dirty;

+ dirtyMap[requests[i].entry.toURL()] = results[i].present;

}

return get(

this.contentMetadataProvider_,