This repository was archived by the owner on Sep 6, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Fixed: Issue 2509 Double-clicking in rename input acts like double-clicking file normally #2802
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -358,6 +358,16 @@ define(function (require, exports, module) { | |
_redraw(true, false); | ||
} | ||
|
||
/** | ||
* Returns false when the event occured without any input present in the li closest to the event.target | ||
* | ||
* @param {event} event to check | ||
* @return boolean true if an input field is present | ||
*/ | ||
function isInRename(event) { | ||
return ($(event.target).closest("li").find("input").length === 0); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The logic got reversed. You want to check length > 0, right? |
||
} | ||
|
||
/** | ||
* @private | ||
* Given an input to jsTree's json_data.data setting, display the data in the file tree UI | ||
|
@@ -534,7 +544,7 @@ define(function (require, exports, module) { | |
.unbind("dblclick.jstree") | ||
.bind("dblclick.jstree", function (event) { | ||
var entry = $(event.target).closest("li").data("entry"); | ||
if (entry && entry.isFile) { | ||
if (entry && entry.isFile && !isInRename(event)) { | ||
FileViewController.addToWorkingSetAndSelect(entry.fullPath); | ||
} | ||
}); | ||
|
@@ -1356,4 +1366,5 @@ define(function (require, exports, module) { | |
exports.renameItemInline = renameItemInline; | ||
exports.forceFinishRename = forceFinishRename; | ||
exports.showInTree = showInTree; | ||
exports.isInRename = isInRename; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove export for now. If anyone needs it, they can add it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also, since it's no longer being exported, it's private, so name shold be _isInRename(). |
||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this function will be more useful if it takes an element (event.target) instead of an event. Code would then be: