Merge 97620 - [filebrowser] Enable fileBrowserHandlers only for files, not directories.

chrome/browser/resources/file_manager/js/file_manager.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Setting the src of an img to an empty string can crash the browser, so we
 // use an empty 1x1 gif instead.
 const EMPTY_IMAGE_URI = 'data:image/gif;base64,'
         + 'R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw%3D%3D';
 
 var g_slideshow_data = null;
@@ skipping 218 matching lines @@
   };
 
   const previewArt = {
     'audio': 'images/filetype_large_audio.png',
     'folder': 'images/filetype_large_folder.png',
     'unknown': 'images/filetype_large_generic.png',
     'video': 'images/filetype_large_video.png'
   };
 
   /**
+   * Regexp for archive files. Used to show mount-archive task.
+   */
+  const ARCHIVES_REGEXP = /.zip$/;
+
+  /**
    * Return a translated string.
    *
    * Wrapper function to make dealing with translated strings more concise.
    * Equivilant to localStrings.getString(id).
    *
    * @param {string} id The id of the string to return.
    * @return {string} The translated string.
    */
   function str(id) {
     return localStrings.getString(id);
@@ skipping 1235 matching lines @@
       }
 
       if (pendingFiles.length) {
         cacheEntrySize(pendingFiles.pop(), cacheNextFile);
       } else {
         self.dispatchEvent(new cr.Event('selection-summarized'));
       }
     };
 
     if (this.dialogType_ == FileManager.DialogType.FULL_PAGE) {
-      // Since unmount task cannot be defined in terms of file patterns,
-      // we manually include it here, if all selected items are mount points.
-      chrome.fileBrowserPrivate.getFileTasks(
-          selection.urls,
-          this.onTasksFound_.bind(this,
-                                  this.shouldShowUnmount_(selection.urls)));
+      // Some internal tasks cannot be defined in terms of file patterns,
+      // so we pass selection to check for them manually.
+      if (selection.directoryCount == 0 && selection.fileCount > 0) {
+        // Only files, not directories, are supported for external tasks.
+        chrome.fileBrowserPrivate.getFileTasks(
+            selection.urls,
+            this.onTasksFound_.bind(this, selection));
+      } else {
+        // There may be internal tasks for directories.
+        this.onTasksFound_(selection, []);
+      }
     }
 
     cacheNextFile();
   };
 
   FileManager.prototype.onMetadataResult_ = function(fileURL, metadata) {
     var observers = this.metadataCache_[fileURL];
     if (!observers || !(observers instanceof Array)) {
       console.error('Missing or invalid metadata observers: ' + fileURL + ': ' +
                     observers);
@@ skipping 34 matching lines @@
     if (!(methodName in this)) {
       console.log('Unknown message from metadata reader: ' + data.verb, data);
       return;
     }
 
     this[methodName].apply(this, data.arguments);
   };
 
   /**
    * Callback called when tasks for selected files are determined.
-   * @param {boolean} unmount Whether unmount task should be included.
+   * @param {Object} selection Selection is passed here, since this.selection
+   *     can change before tasks were found, and we should be accurate.
    * @param {Array.<Task>} tasksList The tasks list.
    */
-  FileManager.prototype.onTasksFound_ = function(unmount, tasksList) {
-    if (unmount) {
-      tasksList.push({
-          taskId: this.getExtensionId_() + '|unmount-archive',
-          iconUrl: '',
-          title: ''
-      });
-    }
+  FileManager.prototype.onTasksFound_ = function(selection, tasksList) {
 
     this.taskButtons_.innerHTML = '';
     for (var i = 0; i < tasksList.length; i++) {
       var task = tasksList[i];
 
       // Tweak images, titles of internal tasks.
       var task_parts = task.taskId.split('|');
       if (task_parts[0] == this.getExtensionId_()) {
         if (task_parts[1] == 'preview') {
           // TODO(serya): This hack needed until task.iconUrl get working
@@ skipping 13 matching lines @@
         } else if (task_parts[1] == 'enqueue') {
           task.iconUrl =
               chrome.extension.getURL('images/icon_add_to_queue_16x16.png');
           task.title = str('ENQUEUE');
         } else if (task_parts[1] == 'mount-archive') {
           task.iconUrl =
               chrome.extension.getURL('images/icon_mount_archive_16x16.png');
           task.title = str('MOUNT_ARCHIVE');
           if (str('ENABLE_ARCHIVES') != 'true')
             continue;
-        } else if (task_parts[1] == 'unmount-archive') {
-          task.iconUrl =
-              chrome.extension.getURL('images/icon_unmount_archive_16x16.png');
-          task.title = str('UNMOUNT_ARCHIVE');
-          if (str('ENABLE_ARCHIVES') != 'true')
-            continue;
         }
       }
+      this.renderTaskButton_(task);
+    }
+    this.maybeRenderUnmountTask_(selection);
+  };
 
-      var button = this.document_.createElement('button');
-      button.addEventListener('click', this.onTaskButtonClicked_.bind(this));
-      button.className = 'task-button';
-      button.task = task;
+  FileManager.prototype.renderTaskButton_ = function(task) {
+    var button = this.document_.createElement('button');
+    button.addEventListener('click', this.onTaskButtonClicked_.bind(this));
+    button.className = 'task-button';
+    button.task = task;
 
-      var img = this.document_.createElement('img');
-      img.src = task.iconUrl;
+    var img = this.document_.createElement('img');
+    img.src = task.iconUrl;
 
-      button.appendChild(img);
-      button.appendChild(this.document_.createTextNode(task.title));
+    button.appendChild(img);
+    button.appendChild(this.document_.createTextNode(task.title));
 
-      this.taskButtons_.appendChild(button);
+    this.taskButtons_.appendChild(button);
+  };
+
+  /**
+   * Checks whether unmount task should be displayed and if the answer is
+   * affirmative renders it.
+   * @param {Object} selection Selected files object.
+   */
+  FileManager.prototype.maybeRenderUnmountTask_ = function(selection) {
+    for (var index = 0; index < selection.urls.length; ++index) {
+      // Each url should be a mount point.
+      var path = selection.urls[index];
+      if (!this.mountPoints_.hasOwnProperty(path) ||
+          this.mountPoints_[path].type != 'file')
+        return;
     }
-  };
+    this.renderTaskButton_({
+        taskId: this.getExtensionId_() + '|unmount-archive',
+        iconUrl:
+            chrome.extension.getURL('images/icon_unmount_archive_16x16.png'),
+        title: str('UNMOUNT_ARCHIVE')
+    });
+   };
 
   FileManager.prototype.getExtensionId_ = function() {
     return chrome.extension.getURL('').split('/')[2];
   };
 
   FileManager.prototype.onTaskButtonClicked_ = function(event) {
     chrome.fileBrowserPrivate.executeTask(event.srcElement.task.taskId,
                                           this.selection.urls);
   };
 
@@ skipping 62 matching lines @@
         this.mountRequests_.push(urls[index]);
         chrome.fileBrowserPrivate.addMount(urls[index], 'file', {});
       }
     } else if (id == 'unmount-archive') {
       for (var index = 0; index < urls.length; ++index) {
         chrome.fileBrowserPrivate.removeMount(urls[index]);
       }
     }
   };
 
-  /**
-   * Determines whether unmount task should present for selected files.
-   */
-  FileManager.prototype.shouldShowUnmount_ = function(urls) {
-    for (var index = 0; index < urls.length; ++index) {
-      // Each url should be a mount point.
-      var path = urls[index];
-      if (!this.mountPoints_.hasOwnProperty(path) ||
-          this.mountPoints_[path].type != 'file') {
-        return false;
-      }
-    }
-    return true;
-  };
-
   FileManager.prototype.onImageEditorSave = function(canvas) {
     console.warn('Saving images not implemented');
   };
 
   FileManager.prototype.onImageEditorClose = function() {
     this.imageEditorFrame_.style.display = 'none';
     this.imageEditor_ = null;
   };
 
   /**
@@ skipping 1210 matching lines @@
 
     if (msg) {
       console.log('no no no');
       this.alert.show(msg, onAccept);
       return false;
     }
 
     return true;
   };
 })();