Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/brackets.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"get_involved_url" : "https://github.com/adobe/brackets/blob/master/CONTRIBUTING.md",
"glob_help_url" : "https://github.com/adobe/brackets/wiki/Using-File-Filters",
"release_notes_url" : "https://github.com/adobe/brackets/wiki/Release-Notes",
"homepage_url" : "http://brackets.io",
"twitter_url" : "https://twitter.com/brackets",
"troubleshoot_url" : "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev",
"twitter_name" : "@brackets",
Expand Down
1 change: 1 addition & 0 deletions src/command/Commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ define(function (require, exports, module) {
exports.HELP_RELEASE_NOTES = "help.releaseNotes"; // HelpCommandHandlers.js _handleLinkMenuItem()
exports.HELP_GET_INVOLVED = "help.getInvolved"; // HelpCommandHandlers.js _handleLinkMenuItem()
exports.HELP_SHOW_EXT_FOLDER = "help.showExtensionsFolder"; // HelpCommandHandlers.js _handleShowExtensionsFolder()
exports.HELP_HOMEPAGE = "help.homepage"; // HelpCommandHandlers.js _handleLinkMenuItem()
exports.HELP_TWITTER = "help.twitter"; // HelpCommandHandlers.js _handleLinkMenuItem()

// File shell callbacks - string must MATCH string in native code (appshell/command_callbacks.h)
Expand Down
8 changes: 6 additions & 2 deletions src/command/DefaultMenus.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,15 @@ define(function (require, exports, module) {

var hasAboutItem = (brackets.platform !== "mac" || !brackets.nativeMenus);

// Add final divider only if we have a twitter URL or about item
if (hasAboutItem || brackets.config.twitter_url) {
// Add final divider only if we have a homepage URL or twitter URL or about item
if (hasAboutItem || brackets.config.homepage_url || brackets.config.twitter_url) {
menu.addMenuDivider();
}

if (brackets.config.homepage_url) {
menu.addMenuItem(Commands.HELP_HOMEPAGE);
}

if (brackets.config.twitter_url) {
menu.addMenuItem(Commands.HELP_TWITTER);
}
Expand Down
1 change: 1 addition & 0 deletions src/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"get_involved_url": "https://github.com/adobe/brackets/blob/master/CONTRIBUTING.md",
"glob_help_url": "https://github.com/adobe/brackets/wiki/Using-File-Filters",
"release_notes_url": "https://github.com/adobe/brackets/wiki/Release-Notes",
"homepage_url": "http://brackets.io",
"twitter_url": "https://twitter.com/brackets",
"troubleshoot_url": "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev",
"twitter_name": "@brackets",
Expand Down
1 change: 1 addition & 0 deletions src/help/HelpCommandHandlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ define(function (require, exports, module) {
CommandManager.register(Strings.CMD_RELEASE_NOTES, Commands.HELP_RELEASE_NOTES, _handleLinkMenuItem(brackets.config.release_notes_url));
CommandManager.register(Strings.CMD_GET_INVOLVED, Commands.HELP_GET_INVOLVED, _handleLinkMenuItem(brackets.config.get_involved_url));
CommandManager.register(Strings.CMD_SHOW_EXTENSIONS_FOLDER, Commands.HELP_SHOW_EXT_FOLDER, _handleShowExtensionsFolder);
CommandManager.register(Strings.CMD_HOMEPAGE, Commands.HELP_HOMEPAGE, _handleLinkMenuItem(brackets.config.homepage_url));
CommandManager.register(Strings.CMD_TWITTER, Commands.HELP_TWITTER, _handleLinkMenuItem(brackets.config.twitter_url));
CommandManager.register(Strings.CMD_ABOUT, Commands.HELP_ABOUT, _handleAboutDialog);
});
1 change: 1 addition & 0 deletions src/nls/root/strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ define({
"CMD_RELEASE_NOTES" : "Release Notes",
"CMD_GET_INVOLVED" : "Get Involved",
"CMD_SHOW_EXTENSIONS_FOLDER" : "Show Extensions Folder",
"CMD_HOMEPAGE" : "Brackets Homepage",
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this have read "{APP_TITLE} Homepage" instead, like two lines down for the About window?

Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch! I re-opened #7579 .

cc @BerndSchwarzenbacher

"CMD_TWITTER" : "{TWITTER_NAME} on Twitter",
"CMD_ABOUT" : "About {APP_TITLE}",
"CMD_OPEN_PREFERENCES" : "Open Preferences File",
Expand Down