Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Unified Diff: ui/file_manager/file_manager/foreground/js/quick_view_controller.js

Issue 2269463002: Render low-resolution image first on Quick View. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Made it work. Created 4 years, 4 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/list_thumbnail_loader.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/file_manager/file_manager/foreground/js/quick_view_controller.js
diff --git a/ui/file_manager/file_manager/foreground/js/quick_view_controller.js b/ui/file_manager/file_manager/foreground/js/quick_view_controller.js
index aef17cdee1cec90d58fdb2902f48f2d13c3ee9fa..17cdbb35ff1cb4390400b26082d5af4a95cdd271 100644
--- a/ui/file_manager/file_manager/foreground/js/quick_view_controller.js
+++ b/ui/file_manager/file_manager/foreground/js/quick_view_controller.js
@@ -184,9 +184,15 @@ QuickViewController.prototype.updateQuickView_ = function() {
(/** @type {!FileEntry} */ (this.quickViewModel_.getSelectedEntry()));
assert(entry);
this.quickViewUma_.onEntryChanged(entry);
- return this.metadataModel_.get([entry], ['thumbnailUrl', 'externalFileUrl'])
+ return this.metadataModel_
+ .get(
+ [entry],
+ [
+ 'thumbnailUrl', 'externalFileUrl', 'customIconUrl',
+ 'croppedThumbnailUrl', 'contentThumbnailUrl',
+ ])
.then(this.onMetadataLoaded_.bind(this, entry));
-};
+}
/**
* Update quick view using file entry and loaded metadata.
@@ -199,6 +205,9 @@ QuickViewController.prototype.onMetadataLoaded_ = function(entry, items) {
return this.getQuickViewParameters_(entry, items).then(function(params) {
this.quickView_.contentUrl = params.contentUrl || '';
this.quickView_.type = params.type || '';
+ this.quickView_.contentThumbnailUrl = params.contentThumbnailUrl || '';
+ this.quickView_.imageHeight = params.imageHeight || 0;
+ this.quickView_.imageWidth = params.imageWidth || 0;
this.quickView_.filePath = params.filePath || '';
this.quickView_.videoPoster = params.videoPoster || '';
this.quickView_.audioArtwork = params.audioArtwork || '';
@@ -211,6 +220,7 @@ QuickViewController.prototype.onMetadataLoaded_ = function(entry, items) {
* type: string,
* filePath: string,
* contentUrl: (string|undefined),
+ * contentThumbnailUrl: (string|undefined),
* videoPoster: (string|undefined),
* audioArtwork: (string|undefined),
* autoplay: (boolean|undefined)
@@ -233,6 +243,7 @@ QuickViewController.prototype.getQuickViewParameters_ = function(entry, items) {
var params = {
type: type,
filePath: entry.name,
+ contentThumbnailUrl: item.contentThumbnailUrl,
};
/**
@@ -254,8 +265,15 @@ QuickViewController.prototype.getQuickViewParameters_ = function(entry, items) {
return params;
}.bind(this));
}
- } else {
- return getFile(entry).then(function(file) {
+ } else { // Download
+ return Promise.all([
+ this.metadataModel_.get([entry], ['imageHeight', 'imageWidth']),
+ getFile(entry)
+ ]).then(function(values) {
+ var item = values[0][0];
+ var file = values[1];
+ params.imageHeight = item.imageHeight;
+ params.imageWidth = item.imageWidth;
params.contentUrl = URL.createObjectURL(file);
return params;
});
@@ -298,7 +316,7 @@ QuickViewController.prototype.getQuickViewParameters_ = function(entry, items) {
var file = values[1];
var item = items[0];
if (item.contentThumbnailUrl) {
- params.audioArtwork = item.contentThumbnailUrl;
+ params.contentThumbnailUrl = item.contentThumbnailUrl;
}
params.contentUrl = URL.createObjectURL(file);
return params;
« no previous file with comments | « ui/file_manager/file_manager/foreground/js/list_thumbnail_loader.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698