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

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

Issue 1158923004: Add support to mime types in Files app UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests. Created 5 years, 7 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
Index: ui/file_manager/file_manager/foreground/js/directory_contents.js
diff --git a/ui/file_manager/file_manager/foreground/js/directory_contents.js b/ui/file_manager/file_manager/foreground/js/directory_contents.js
index 83d99cfa5dc430988c041b2c36a240611d892024..4b87f4f61d4bed0a08b9b3f239a567c8fd365e18 100644
--- a/ui/file_manager/file_manager/foreground/js/directory_contents.js
+++ b/ui/file_manager/file_manager/foreground/js/directory_contents.js
@@ -550,7 +550,9 @@ FileListModel.prototype.onAddEntryToList_ = function(entry) {
else
this.numFiles_++;
- if (FileType.isImage(entry) || FileType.isRaw(entry))
+ var mimeType = this.metadataModel_.getCache([entry],
+ ['contentMimeType'])[0].contentMimeType;
+ if (FileType.isImage(entry, mimeType) || FileType.isRaw(entry, mimeType))
this.numImageFiles_++;
};
@@ -565,7 +567,9 @@ FileListModel.prototype.onRemoveEntryFromList_ = function(entry) {
else
this.numFiles_--;
- if (FileType.isImage(entry) || FileType.isRaw(entry))
+ var mimeType = this.metadataModel_.getCache([entry],
+ ['contentMimeType'])[0].contentMimeType;
+ if (FileType.isImage(entry, mimeType) || FileType.isRaw(entry, mimeType))
this.numImageFiles_--;
};
@@ -641,8 +645,11 @@ FileListModel.prototype.compareType_ = function(a, b) {
if (a.isDirectory !== b.isDirectory)
return a.isDirectory === this.isDescendingOrder_ ? 1 : -1;
- var aType = FileListModel.getFileTypeString(FileType.getType(a));
- var bType = FileListModel.getFileTypeString(FileType.getType(b));
+ var properties = this.metadataModel_.getCache([a, b], ['contentMimeType']);
+ var aType = FileListModel.getFileTypeString(
+ FileType.getType(a, properties[0].contentMimeType));
+ var bType = FileListModel.getFileTypeString(
+ FileType.getType(b, properties[1].contentMimeType));
var result = util.collator.compare(aType, bType);
return result !== 0 ? result : util.compareName(a, b);

Powered by Google App Engine
This is Rietveld 408576698