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

Improve working-set context menu UI/UX #6107

Merged
merged 8 commits into from
Mar 5, 2014
Merged

Improve working-set context menu UI/UX #6107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2801cbe
Improve working-set context menu UI/UX
artoale Nov 25, 2013
a82c684
Reduce cog size to 13px
artoale Nov 25, 2013
304d43b
Reduce cog opacity for non-hover status
artoale Nov 25, 2013
fd64f9f
Fix cog color and position
artoale Nov 26, 2013
b8db8ab
Add tests for ContextMenu#isOpen
artoale Nov 27, 2013
7071d61
Refactor work set menu sorting event handler
artoale Dec 2, 2013
7e10b99
Refactor RecentProject ext to use ContextMenu#assignContextMenuToSele…
artoale Dec 2, 2013
9273139
Add @param jsdoc description
artoale Dec 12, 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
21 changes: 15 additions & 6 deletions src/command/DefaultMenus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ define(function (require, exports, module) {

var AppInit = require("utils/AppInit"),
Commands = require("command/Commands"),
ContextMenu = require("command/Menus"),
EditorManager = require("editor/EditorManager"),
Menus = require("command/Menus"),
Strings = require("strings");
Expand Down Expand Up @@ -195,7 +196,6 @@ define(function (require, exports, module) {
project_cmenu.addMenuItem(Commands.FILE_REFRESH);

var working_set_cmenu = Menus.registerContextMenu(Menus.ContextMenuIds.WORKING_SET_MENU);
working_set_cmenu.addMenuItem(Commands.FILE_CLOSE);
working_set_cmenu.addMenuItem(Commands.FILE_SAVE);
working_set_cmenu.addMenuItem(Commands.FILE_SAVE_AS);
working_set_cmenu.addMenuItem(Commands.FILE_RENAME);
Expand All @@ -204,11 +204,15 @@ define(function (require, exports, module) {
working_set_cmenu.addMenuDivider();
working_set_cmenu.addMenuItem(Commands.EDIT_FIND_IN_SUBTREE);
working_set_cmenu.addMenuDivider();
working_set_cmenu.addMenuItem(Commands.SORT_WORKINGSET_BY_ADDED);
working_set_cmenu.addMenuItem(Commands.SORT_WORKINGSET_BY_NAME);
working_set_cmenu.addMenuItem(Commands.SORT_WORKINGSET_BY_TYPE);
working_set_cmenu.addMenuDivider();
working_set_cmenu.addMenuItem(Commands.SORT_WORKINGSET_AUTO);
working_set_cmenu.addMenuItem(Commands.FILE_CLOSE);


var working_set_settings_cmenu = Menus.registerContextMenu(Menus.ContextMenuIds.WORKING_SET_SETTINGS_MENU);
working_set_settings_cmenu.addMenuItem(Commands.SORT_WORKINGSET_BY_ADDED);
working_set_settings_cmenu.addMenuItem(Commands.SORT_WORKINGSET_BY_NAME);
working_set_settings_cmenu.addMenuItem(Commands.SORT_WORKINGSET_BY_TYPE);
working_set_settings_cmenu.addMenuDivider();
working_set_settings_cmenu.addMenuItem(Commands.SORT_WORKINGSET_AUTO);

var editor_cmenu = Menus.registerContextMenu(Menus.ContextMenuIds.EDITOR_MENU);
// editor_cmenu.addMenuItem(Commands.NAVIGATE_JUMPTO_DEFINITION);
Expand Down Expand Up @@ -274,6 +278,11 @@ define(function (require, exports, module) {
working_set_cmenu.open(e);
});

/**
* Dropdown menu for workspace sorting
*/
Menus.ContextMenu.assignContextMenuToSelector("#working-set-option-btn", working_set_settings_cmenu);

// Prevent the browser context menu since Brackets creates a custom context menu
$(window).contextmenu(function (e) {
e.preventDefault();
Expand Down
Loading