Commit 6e7df01d authored by fukino's avatar fukino Committed by Commit bot

Hide .crdownload files and prevent users from changing extension to it.

BUG=409490
TEST=manually

Review URL: https://codereview.chromium.org/528263002

Cr-Commit-Position: refs/heads/master@{#293477}
parent 7759d7ae
...@@ -1344,6 +1344,8 @@ util.validateFileName = function(parentEntry, name, filterHiddenOn) { ...@@ -1344,6 +1344,8 @@ util.validateFileName = function(parentEntry, name, filterHiddenOn) {
return Promise.reject(str('ERROR_WHITESPACE_NAME')); return Promise.reject(str('ERROR_WHITESPACE_NAME'));
else if (/^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])$/i.test(name)) else if (/^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])$/i.test(name))
return Promise.reject(str('ERROR_RESERVED_NAME')); return Promise.reject(str('ERROR_RESERVED_NAME'));
else if (filterHiddenOn && /\.crdownload$/i.test(name))
return Promise.reject(str('ERROR_RESERVED_NAME'));
else if (filterHiddenOn && name[0] == '.') else if (filterHiddenOn && name[0] == '.')
return Promise.reject(str('ERROR_HIDDEN_NAME')); return Promise.reject(str('ERROR_HIDDEN_NAME'));
......
...@@ -319,7 +319,8 @@ DriveMetadataSearchContentScanner.prototype.scan = function( ...@@ -319,7 +319,8 @@ DriveMetadataSearchContentScanner.prototype.scan = function(
* When filters are changed, a 'changed' event is fired. * When filters are changed, a 'changed' event is fired.
* *
* @param {MetadataCache} metadataCache Metadata cache service. * @param {MetadataCache} metadataCache Metadata cache service.
* @param {boolean} showHidden If files starting with '.' are shown. * @param {boolean} showHidden If files starting with '.' or ending with
* '.crdownlaod' are shown.
* @constructor * @constructor
* @extends {cr.EventTarget} * @extends {cr.EventTarget}
*/ */
...@@ -371,10 +372,14 @@ FileFilter.prototype.removeFilter = function(name) { ...@@ -371,10 +372,14 @@ FileFilter.prototype.removeFilter = function(name) {
* @param {boolean} value If do not show hidden files. * @param {boolean} value If do not show hidden files.
*/ */
FileFilter.prototype.setFilterHidden = function(value) { FileFilter.prototype.setFilterHidden = function(value) {
var regexpCrdownloadExtension = /\.crdownload$/i;
if (value) { if (value) {
this.addFilter( this.addFilter(
'hidden', 'hidden',
function(entry) { return entry.name.substr(0, 1) !== '.'; } function(entry) {
return entry.name.substr(0, 1) !== '.' &&
!regexpCrdownloadExtension.test(entry.name);
}
); );
} else { } else {
this.removeFilter('hidden'); this.removeFilter('hidden');
......
...@@ -932,7 +932,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52; ...@@ -932,7 +932,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
this.fileFilter_ = new FileFilter( this.fileFilter_ = new FileFilter(
this.metadataCache_, this.metadataCache_,
false /* Don't show dot files by default. */); false /* Don't show dot files and *.crdownload by default. */);
this.fileWatcher_ = new FileWatcher(this.metadataCache_); this.fileWatcher_ = new FileWatcher(this.metadataCache_);
this.fileWatcher_.addEventListener( this.fileWatcher_.addEventListener(
......
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