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

After extension is updated/removed, reload Brackets instead of quitting #6487

Merged
redmunds merged 6 commits into from
Jan 14, 2014
Merged

After extension is updated/removed, reload Brackets instead of quitting #6487

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7875aa7
After an extension is updated/removed, reload Brackets instead of qui…
lkcampbell Jan 12, 2014
7d8ce45
Small cleanups. Move reload functions to DocumentCommandHandlers.
lkcampbell Jan 12, 2014
a4347e5
Small cleanups. Update string constant names.
lkcampbell Jan 12, 2014
f86246f
Roll back incorrect changes on translation strings
lkcampbell Jan 13, 2014
5adb2ea
Small code clean up
lkcampbell Jan 13, 2014
a583cd4
Update ExtensionManager unit tests and small clean up
lkcampbell Jan 14, 2014
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
12 changes: 7 additions & 5 deletions src/extensibility/ExtensionManagerDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ define(function (require, exports, module) {

var dialogTemplate = require("text!htmlContent/extension-manager-dialog.html");

var DEBUG_REFRESH_WINDOW = "debug.refreshWindow";

// bootstrap tabs component
require("widgets/bootstrap-tab");

Expand Down Expand Up @@ -103,7 +105,7 @@ define(function (require, exports, module) {
ExtensionManager.updateExtensions()
.done(function () {
dlg.close();
CommandManager.execute(Commands.FILE_QUIT);
CommandManager.execute(DEBUG_REFRESH_WINDOW);
})
.fail(function (errorArray) {
dlg.close();
Expand All @@ -126,8 +128,8 @@ define(function (require, exports, module) {
Strings.EXTENSION_MANAGER_UPDATE,
StringUtils.format(Strings.EXTENSION_MANAGER_UPDATE_ERROR, ids.join(", "))
).done(function () {
// We still have to quit even if some of the removals failed.
CommandManager.execute(Commands.FILE_QUIT);
// We still have to reload even if some of the removals failed.
CommandManager.execute(DEBUG_REFRESH_WINDOW);
});
});
})
Expand All @@ -144,8 +146,8 @@ define(function (require, exports, module) {
Strings.EXTENSION_MANAGER_REMOVE,
StringUtils.format(Strings.EXTENSION_MANAGER_REMOVE_ERROR, ids.join(", "))
).done(function () {
// We still have to quit even if some of the removals failed.
CommandManager.execute(Commands.FILE_QUIT);
// We still have to reload even if some of the removals failed.
CommandManager.execute(DEBUG_REFRESH_WINDOW);
});
});
} else {
Expand Down
14 changes: 7 additions & 7 deletions src/nls/root/strings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,23 +402,23 @@ define({
"EXTENSION_ERROR" : "Extension error",
"EXTENSION_KEYWORDS" : "Keywords",
"EXTENSION_INSTALLED" : "Installed",
"EXTENSION_UPDATE_INSTALLED" : "This extension update has been downloaded and will be installed when you quit {APP_NAME}.",
"EXTENSION_UPDATE_INSTALLED" : "This extension update has been downloaded and will be installed after {APP_NAME} automatically reloads.",
Copy link
Copy Markdown
Contributor

@redmunds redmunds Jan 12, 2014

Choose a reason for hiding this comment

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

I don't think that the word "automatically" is necessary in any of these messages.

"EXTENSION_SEARCH_PLACEHOLDER" : "Search",
"EXTENSION_MORE_INFO_LINK" : "More",
"BROWSE_EXTENSIONS" : "Browse Extensions",
"EXTENSION_MANAGER_REMOVE" : "Remove Extension",
"EXTENSION_MANAGER_REMOVE_ERROR" : "Unable to remove one or more extensions: {0}. {APP_NAME} will still quit.",
"EXTENSION_MANAGER_REMOVE_ERROR" : "Unable to remove one or more extensions: {0}. {APP_NAME} will still automatically reload.",
"EXTENSION_MANAGER_UPDATE" : "Update Extension",
"EXTENSION_MANAGER_UPDATE_ERROR" : "Unable to update one or more extensions: {0}. {APP_NAME} will still quit.",
"EXTENSION_MANAGER_UPDATE_ERROR" : "Unable to update one or more extensions: {0}. {APP_NAME} will still automatically reload.",
"MARKED_FOR_REMOVAL" : "Marked for removal",
"UNDO_REMOVE" : "Undo",
"MARKED_FOR_UPDATE" : "Marked for update",
"UNDO_UPDATE" : "Undo",
"CHANGE_AND_QUIT_TITLE" : "Change Extensions",
"CHANGE_AND_QUIT_MESSAGE" : "To update or remove the marked extensions, you need to quit and restart {APP_NAME}. You'll be prompted to save unsaved changes.",
"REMOVE_AND_QUIT" : "Remove Extensions and Quit",
"CHANGE_AND_QUIT" : "Change Extensions and Quit",
"UPDATE_AND_QUIT" : "Update Extensions and Quit",
"CHANGE_AND_QUIT_MESSAGE" : "To update or remove the marked extensions, {APP_NAME} will need to automatically reload. You'll be prompted to save unsaved changes.",
"REMOVE_AND_QUIT" : "Remove Extensions and Reload",
"CHANGE_AND_QUIT" : "Change Extensions and Reload",
"UPDATE_AND_QUIT" : "Update Extensions and Reload",
Copy link
Copy Markdown
Contributor

@redmunds redmunds Jan 12, 2014

Choose a reason for hiding this comment

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

Yes, I think "QUIT" should be changed to "REMOVE""RELOAD" in the message id's.

Copy link
Copy Markdown
Contributor Author

@lkcampbell lkcampbell Jan 12, 2014

Choose a reason for hiding this comment

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

Just to clarify what was probably a typo..."RELOAD"? As in, "UPDATE_AND_QUIT" becomes "UPDATE_AND_RELOAD"?

Copy link
Copy Markdown
Contributor

@redmunds redmunds Jan 12, 2014

Choose a reason for hiding this comment

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

Yes :)

"PROCESSING_EXTENSIONS" : "Processing extension changes\u2026",
"EXTENSION_NOT_INSTALLED" : "Couldn't remove extension {0} because it wasn't installed.",
"NO_EXTENSIONS" : "No extensions installed yet.<br>Click on the Available tab above to get started.",
Expand Down
⚡