Merge pull request #9015 from adobe/ProjectManager

Project manager revamp
adobe · Sep 22, 2014 · d094245 · d094245
2 parents f40ea05 + 5469b7c
commit d094245
Show file tree

Hide file tree

Showing 39 changed files with 6,455 additions and 6,586 deletions.
diff --git a/.brackets.json b/.brackets.json
@@ -4,7 +4,8 @@
         "plusplus": true,
         "devel": true,
         "nomen": true,
-        "maxerr": 50
+        "maxerr": 50,
+        "es5": true
     },
     "defaultExtension": "js",
     "path": {

diff --git a/src/command/Menus.js b/src/command/Menus.js
@@ -1098,6 +1098,7 @@ define(function (require, exports, module) {
      * Closes the context menu.
      */
     ContextMenu.prototype.close = function () {
+        $(this).triggerHandler("beforeContextMenuClose");
         $("#" + StringUtils.jQueryIdEscape(this.id)).removeClass("open");
     };
 

diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -1382,7 +1382,7 @@ define(function (require, exports, module) {
     /** Show a textfield to rename whatever is currently selected in the sidebar (or current doc if nothing else selected) */
     function handleFileRename() {
         // Prefer selected sidebar item (which could be a folder)
-        var entry = ProjectManager.getSelectedItem();
+        var entry = ProjectManager.getContext();
         if (!entry) {
             // Else use current file (not selected in ProjectManager if not visible in tree or workingset)
             entry = MainViewManager.getCurrentlyViewedFile();