Merge pull request #8194 from SAPlayer/file-right-click-no-rename

Narciso Jaramillo · Narciso Jaramillo · commit cd785359894b · 2014-06-19T21:18:01.000-04:00
Only listen for left clicks for entering rename mode
diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
@@ -664,11 +664,15 @@ define(function (require, exports, module) {
                     }
                 }
             ).bind("mouseup.jstree", function (event) {
+                if (event.button !== 0) { // 0 = Left mouse button
+                    return;
+                }
+
                 var $treenode = $(event.target).closest("li");
                 if ($treenode.is($(_projectTree.jstree("get_selected")))) {
                     // wrap this in a setTimeout function so that we can check if it's a double click.
-                    _mouseupTimeoutId = window.setTimeout(function (event) {
-                        // if we get a double-click,_mouseupTimeoutId will have been set to lull by the double-click handler before this runs.
+                    _mouseupTimeoutId = window.setTimeout(function () {
+                        // if we get a double-click, _mouseupTimeoutId will have been set to null by the double-click handler before this runs.
                         if (_mouseupTimeoutId !== null) {
                             CommandManager.execute(Commands.FILE_RENAME);
                         }

Original file line number	Diff line number	Diff line change
`@@ -664,11 +664,15 @@ define(function (require, exports, module) {`
`664`	`664`	`}`
`665`	`665`	`}`
`666`	`666`	`).bind("mouseup.jstree", function (event) {`
	`667`	`+ if (event.button !== 0) { // 0 = Left mouse button`
	`668`	`+ return;`
	`669`	`+ }`
	`670`	`+`
`667`	`671`	`var $treenode = $(event.target).closest("li");`
`668`	`672`	`if ($treenode.is($(_projectTree.jstree("get_selected")))) {`
`669`	`673`	`// wrap this in a setTimeout function so that we can check if it's a double click.`
`670`		`- _mouseupTimeoutId = window.setTimeout(function (event) {`
`671`		`- // if we get a double-click,_mouseupTimeoutId will have been set to lull by the double-click handler before this runs.`
	`674`	`+ _mouseupTimeoutId = window.setTimeout(function () {`
	`675`	`+ // if we get a double-click, _mouseupTimeoutId will have been set to null by the double-click handler before this runs.`
`672`	`676`	`if (_mouseupTimeoutId !== null) {`
`673`	`677`	`CommandManager.execute(Commands.FILE_RENAME);`
`674`	`678`	`}`