From 2fad4e2242eb0d2f73eb57f8165d089377f7c68e Mon Sep 17 00:00:00 2001 From: fukino Date: Thu, 16 Apr 2015 00:54:22 -0700 Subject: [PATCH] Files.app: Prevent dragging files while renaming is in progress. BUG=37273 TEST=manual test Review URL: https://codereview.chromium.org/1089683003 Cr-Commit-Position: refs/heads/master@{#325400} --- .../file_manager/foreground/js/file_transfer_controller.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js b/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js index 8623009e34ee..2eeb6a7e2d89 100644 --- a/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js +++ b/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js @@ -700,6 +700,13 @@ FileTransferController.prototype.renderThumbnail_ = function() { * @private */ FileTransferController.prototype.onDragStart_ = function(list, event) { + // If renaming is in progress, drag operation should be used for selecting + // substring of the text. So we don't drag files here. + if (this.listContainer_.renameInput.currentEntry) { + event.preventDefault(); + return; + } + // Check if a drag selection should be initiated or not. if (list.shouldStartDragSelection(event)) { event.preventDefault(); -- 2.11.4.GIT