file manager: clean up rename click detection

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.
 
 // WK Bug 55728 is fixed on the chrome 12 branch but not on the trunk.
 // TODO(rginda): Enable this everywhere once we have a trunk-worthy fix.
 const ENABLE_METADATA = true;
 
 // Thumbnail view is painful without the exif reader.
 const ENABLE_THUMBNAIL_VIEW = ENABLE_METADATA;
@@ skipping 1707 matching lines @@
           });
       }
 
       spliceArgs.unshift(0, 0);  // index, deleteCount
       self.dataModel_.splice.apply(self.dataModel_, spliceArgs);
 
       // Keep reading until entries.length is 0.
       reader.readEntries(onReadSome);
     };
 
+    // Updated when a user clicks on the label of a file, used to detect
+    // when a click is eligible to trigger a rename.  Can be null, or
+    // an object with 'path' and 'date' properties.
     this.lastLabelClick_ = null;
 
     // Clear the table first.
     this.dataModel_.splice(0, this.dataModel_.length);
 
     this.updateBreadcrumbs_();
 
     if (this.currentDirEntry_.fullPath != '/') {
       // If not the root directory, just read the contents.
       reader = this.currentDirEntry_.createReader();
@@ skipping 80 matching lines @@
     if (event.srcElement.className != 'filename-label')
       return false;
 
     // Wrong button or using a keyboard modifier.
     if (event.button != 0 || event.shiftKey || event.metaKey || event.altKey) {
       this.lastLabelClick_ = null;
       return false;
     }
 
     var now = new Date();
+    var path = event.srcElement.entry.fullPath;
 
-    this.lastLabelClick_ = this.lastLabelClick_ || now;
-    var delay = now - this.lastLabelClick_;
-    if (!row.selected || delay < 500)
-      return false;
+    if (this.lastLabelClick_ && this.lastLabelClick_.path == path) {
+      var delay = now - this.lastLabelClick_.date;
+      if (delay > 500 && delay < 2000)
+        return true;
+    }
 
-    this.lastLabelClick_ = now;
-    return true;
+    this.lastLabelClick_ = {path: path, date: now};
+    return false;
   };
 
   FileManager.prototype.initiateRename_= function(label) {
     var input = this.renameInput_;
 
-    window.label = label;

[rginda, 2011/06/07 22:58:14]

This is some debugging code that slipped in in a previous commit.

-
     input.value = label.textContent;
     input.style.top = label.offsetTop + 'px';
     input.style.left = label.offsetLeft + 'px';
     input.style.width = label.clientWidth + 'px';
     label.parentNode.appendChild(input);
     input.focus();
     var selectionEnd = input.value.lastIndexOf('.');
     if (selectionEnd == -1) {
       input.select();
     } else {
@@ skipping 271 matching lines @@
     } else if (this.dialogType_ == FileManager.DialogType.SELECT_OPEN_FILE) {
       if (!this.selection.leadEntry.isFile)
         throw new Error('Selected entry is not a file!');
     }
 
     chrome.fileBrowserPrivate.selectFile(ary[0], 0);
     window.close();
   };
 
 })();