Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Fix for Issue #3720: File Rename should complete when clicking anywhere in project panel #4934

Merged
JeffryBooher merged 4 commits into from
Sep 6, 2013
Merged

Fix for Issue #3720: File Rename should complete when clicking anywhere in project panel #4934

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f14743
Add listeners for mouse click, side bar resize, and menu popup
lkcampbell Aug 25, 2013
580de96
Do not force rename when clicking on the file that is being renamed
lkcampbell Aug 25, 2013
92a124c
Click handler code cleanup
lkcampbell Aug 25, 2013
8775452
Only keeping the mouse click listener
lkcampbell Aug 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/project/ProjectManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,10 +1546,18 @@ define(function (require, exports, module) {
// Initialize variables and listeners that depend on the HTML DOM
AppInit.htmlReady(function () {
$projectTreeContainer = $("#project-files-container");

$("#open-files-container").on("contentChanged", function () {
_redraw(false); // redraw jstree when working set size changes
});

$(".main-view").click(function (jqEvent) {
if (jqEvent.target.className !== "jstree-rename-input") {
forceFinishRename();
}
});

$("#sidebar").on("panelResizeStart", forceFinishRename);
});

// Init PreferenceStorage
Expand All @@ -1568,7 +1576,8 @@ define(function (require, exports, module) {
CommandManager.register(Strings.CMD_OPEN_FOLDER, Commands.FILE_OPEN_FOLDER, openProject);
CommandManager.register(Strings.CMD_PROJECT_SETTINGS, Commands.FILE_PROJECT_SETTINGS, _projectSettings);
CommandManager.register(Strings.CMD_FILE_REFRESH, Commands.FILE_REFRESH, refreshFileTree);

CommandManager.register(Strings.CMD_BEFORE_MENUPOPUP, Commands.APP_BEFORE_MENUPOPUP, forceFinishRename);
Copy link
Contributor Author

@lkcampbell lkcampbell Aug 25, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we really do this? It appears to be blocking Copy and Paste functionality, even when using shortcut keys.


// Define public API
exports.getProjectRoot = getProjectRoot;
exports.getBaseUrl = getBaseUrl;
Expand Down