summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 01:39:49 +0000
committerbshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 01:39:49 +0000
commit3485bc0beabfbeefdc5a4a0a4e915a5f50d13e41 (patch)
treed8545788fb575d903a6018105d522a035acda39f
parent7226053040be4d22c8f2f297afdb12fa3a8a9b4e (diff)
downloadchromium_src-3485bc0beabfbeefdc5a4a0a4e915a5f50d13e41.zip
chromium_src-3485bc0beabfbeefdc5a4a0a4e915a5f50d13e41.tar.gz
chromium_src-3485bc0beabfbeefdc5a4a0a4e915a5f50d13e41.tar.bz2
Fix double click on table header opens selected file issue.
BUG=chromium-os:26349 TEST=ctrl+m opens file manager -> select a file or folder -> double click table header -> verify the double click doesn't open the selected file Review URL: http://codereview.chromium.org/9348099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121994 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/file_manager/js/file_manager.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index c98ca4b..89dd580 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -2900,8 +2900,10 @@ FileManager.prototype = {
* @param {Event} event The click event.
*/
FileManager.prototype.onDetailDoubleClick_ = function(event) {
- if (this.isRenamingInProgress()) {
- // Don't pay attention to double clicks during a rename.
+ if (this.isRenamingInProgress() ||
+ this.table_.firstChild.contains(event.target)) {
+ // Don't pay attention to double clicks during a rename or double clicks
+ // on the table header.
return;
}