summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhirono@chromium.org <hirono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 09:11:48 +0000
committerhirono@chromium.org <hirono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 09:11:48 +0000
commit5b944ee48e6a6ec247776727869d61f0b3d36174 (patch)
tree601743c69911f57a2444dcf4a12716e9c5445c2e
parent7d943060708624af74a6d589ad3cd26b2a4abdd9 (diff)
downloadchromium_src-5b944ee48e6a6ec247776727869d61f0b3d36174.zip
chromium_src-5b944ee48e6a6ec247776727869d61f0b3d36174.tar.gz
chromium_src-5b944ee48e6a6ec247776727869d61f0b3d36174.tar.bz2
Files.app: Drag selection starts with Shift key.
This CL added a condition check to the head of FileTransferController.onDragStart_, which checkes the state of shift key and if the it is pressed, starts drag selection by calling DragSelector. BUG=224832 TEST=manually R=mtomasz@chromium.org, yoshiki@chromium.org Review URL: https://codereview.chromium.org/16081008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204775 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/file_manager/js/file_transfer_controller.js15
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/browser/resources/file_manager/js/file_transfer_controller.js b/chrome/browser/resources/file_manager/js/file_transfer_controller.js
index fc9a653..87f07f7 100644
--- a/chrome/browser/resources/file_manager/js/file_transfer_controller.js
+++ b/chrome/browser/resources/file_manager/js/file_transfer_controller.js
@@ -46,6 +46,13 @@ function FileTransferController(doc,
* @private
*/
this.selectedFileObjects_ = [];
+
+ /**
+ * Drag selector.
+ * @type {DragSelector}
+ * @private
+ */
+ this.dragSelector_ = new DragSelector();
}
FileTransferController.prototype = {
@@ -296,6 +303,14 @@ FileTransferController.prototype = {
* @param {Event} event A dragstart event of DOM.
*/
onDragStart_: function(list, event) {
+ // Check if a drag selection should be initiated or not.
+ // TODO(hirono): Support drag selection on the grid view. crbug.com/247278
+ if (list.id == 'file-list') {
+ if (event.shiftKey) {
+ this.dragSelector_.startDragSelection(list, event);
+ return;
+ }
+ }
// Nothing selected.
if (!this.selectedEntries_.length) {
event.preventDefault();