Reimplemented Git-FTP features after 489a60c merge #288
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,19 +11,27 @@ define(function (require) { | |
| Events = require("src/Events"), | ||
| EventEmitter = require("src/EventEmitter"), | ||
| Git = require("src/Git/Git"), | ||
| GitFtp = require("src/Git/GitFtp"), | ||
| Preferences = require("src/Preferences"), | ||
| Promise = require("bluebird"), | ||
| Strings = require("strings"), | ||
| Utils = require("src/Utils"), | ||
| q = require("../thirdparty/q"); | ||
|
Member
There was a problem hiding this comment. use new
Contributor
Author
There was a problem hiding this comment. There's a problem replacing q with bluebird... So I can use
Member
There was a problem hiding this comment. Here's the use-case with
Contributor
Author
There was a problem hiding this comment. I already get the two arrays I need, I just don't get the state of the tasks.
Member
There was a problem hiding this comment. Ok, use Q for now and I'll look at it when I'll be merging.
Contributor
Author
There was a problem hiding this comment. I need to abort and throw error only if "Git.getRemotes" fails. |
||
|
|
||
| // Templates | ||
| var gitRemotesPickerTemplate = require("text!htmlContent/git-remotes-picker.html"); | ||
|
|
||
| // Module variables | ||
| var $selectedRemote = null, | ||
| $remotesDropdown = null, | ||
| $gitPanel = null, | ||
| gitFtpEnabled = false; | ||
|
|
||
| function initVariables() { | ||
| $gitPanel = $("#git-panel"); | ||
| $selectedRemote = $gitPanel.find(".git-selected-remote"); | ||
| $remotesDropdown = $gitPanel.find(".git-remotes-dropdown"); | ||
| gitFtpEnabled = Preferences.get("useGitFtp"); | ||
| } | ||
|
|
||
| // Implementation | ||
|
|
@@ -43,100 +51,119 @@ define(function (require) { | |
|
|
||
| function clearRemotePicker() { | ||
| $selectedRemote | ||
| .html("—") | ||
| .data("remote", null); | ||
|
Member
There was a problem hiding this comment. why do you format it like this? please use formatting recomenned by jquery with indentation: http://api.jquery.com/end/
Contributor
Author
There was a problem hiding this comment. Sorry it's the auto indentator, I hate it :| |
||
| } | ||
|
|
||
| function selectRemote(remoteName) { | ||
| if (!remoteName) { | ||
| return clearRemotePicker(); | ||
| } | ||
| // Check if the selected remote is a FTP remote | ||
| var isGitFtp = ($remotesDropdown.find(".remote-name[data-is-gitftp=true][data-remote-name=\"" + remoteName + "\"]").length) ? true : false; | ||
|
|
||
| // Set as default remote only if is not an FTP remote | ||
| if (!isGitFtp) { setDefaultRemote(remoteName); } | ||
|
|
||
| // If is an FTP remote, disable the "pull" button, if not, enable it | ||
| $gitPanel.find("git-pull").prop("disabled", isGitFtp); | ||
|
|
||
| // Enable the Git-FTP prefix if needed (or disable it) | ||
| $selectedRemote.prev(".ftp-prefix").attr("data-is-gitftp", isGitFtp); | ||
|
|
||
| // Update remote name of $selectedRemote | ||
| $selectedRemote.text(remoteName).data("remote", remoteName); | ||
| } | ||
|
|
||
| function refreshRemotesPicker() { | ||
| // Run both getRemotes and getFtpRemotes and render with Mustache the template | ||
| q.allSettled([Git.getRemotes(), GitFtp.getFtpRemotes()]).spread(function (remotes, ftpRemotes) { | ||
|
|
||
| // If both promises are fullfilled then render the template | ||
| if (remotes.state === "fulfilled" && (ftpRemotes.state === "fulfilled" || gitFtpEnabled === false)) { | ||
|
|
||
| // Set default remote name and cache the remotes dropdown menu | ||
| var defaultRemoteName = getDefaultRemote(), | ||
| $remotesDropdown = $gitPanel.find(".git-remotes-dropdown"), | ||
| $remotesDropdownList = ""; | ||
|
|
||
| // Disable Git-push and Git-pull if there are not remotes defined | ||
| $gitPanel.find(".git-pull, .git-push").prop("disabled", (remotes.value.length === 0 && ftpRemotes.value.length === 0)); | ||
|
|
||
| // Add options to change remote | ||
| remotes.value = $.map(remotes.value, function (remote) { | ||
| return { | ||
| "name": remote.name, | ||
| "deletable": (remote.name !== "origin") ? true : false | ||
| }; | ||
| }); | ||
|
|
||
| // Pass to Mustache the needed data | ||
| $remotesDropdownList = Mustache.render(gitRemotesPickerTemplate, { | ||
| Strings: Strings, | ||
| remotes: remotes.value, | ||
| ftpRemotes: ftpRemotes.value, | ||
| hasRemotes: remotes.value.length ? true : false, | ||
| hasFtpRemotes: ftpRemotes.value.length ? true : false, | ||
| gitFtpEnabled: gitFtpEnabled | ||
| }); | ||
|
|
||
| // Inject the rendered template inside the $remotesDropdown | ||
| $remotesDropdown.html($remotesDropdownList); | ||
|
|
||
| if (remotes.value.length !== 0) { | ||
| selectRemote(defaultRemoteName); | ||
| } else { | ||
| clearRemotePicker(); | ||
| } | ||
|
|
||
| if (ftpRemotes.state === "rejected" && gitFtpEnabled === true) { | ||
| throw ErrorHandler.showError( | ||
| ftpRemotes.reason, | ||
| "Failed to get a list of Git-FTP remotes, Git remotes was successfully initalized and are usable." | ||
| ); | ||
| } | ||
|
|
||
| } else { | ||
| if (remotes.state === "rejected") { | ||
| throw ErrorHandler.showError(remotes.reason, "Failed to get a list of remotes."); | ||
| } | ||
| if (ftpRemotes.state === "rejected" && gitFtpEnabled === true) { | ||
| throw ErrorHandler.showError(ftpRemotes.reason, "Failed to get a list of Git-FTP remotes."); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| function handleRemoteCreation() { | ||
| return Utils.askQuestion(Strings.CREATE_NEW_REMOTE, Strings.ENTER_REMOTE_NAME) | ||
| .then(function (name) { | ||
| return Utils.askQuestion(Strings.CREATE_NEW_REMOTE, Strings.ENTER_REMOTE_URL).then(function (url) { | ||
| return [name, url]; | ||
| }); | ||
| }) | ||
| .spread(function (name, url) { | ||
| return Git.createRemote(name, url).then(function () { | ||
| return refreshRemotesPicker(); | ||
| }); | ||
| }) | ||
| .catch(function (err) { | ||
| ErrorHandler.showError(err, "Remote creation failed"); | ||
| }); | ||
| } | ||
|
|
||
| function deleteRemote(remoteName) { | ||
| return Utils.askQuestion(Strings.DELETE_REMOTE, StringUtils.format(Strings.DELETE_REMOTE_NAME, remoteName), { booleanResponse: true }) | ||
| .then(function (response) { | ||
| if (response === true) { | ||
| return Git.deleteRemote(remoteName).then(function () { | ||
| return refreshRemotesPicker(); | ||
| }); | ||
| } | ||
| }) | ||
| .catch(function (err) { | ||
| ErrorHandler.logError(err); | ||
| }); | ||
| } | ||
|
|
||
| function pullFromRemote(remoteName) { | ||
|
|
@@ -205,11 +232,11 @@ define(function (require) { | |
| return new Promise(function (resolve, reject) { | ||
| Utils.askQuestion(Strings.SET_ORIGIN_URL, _.escape(Strings.URL)).then(function (url) { | ||
| Git.createRemote("origin", url) | ||
| .then(function () { | ||
| return Git.push("origin"); | ||
| }) | ||
| .then(resolve) | ||
| .catch(reject); | ||
| }); | ||
| }); | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lets use
type="normal"andtype="ftp"so we can add other types in the future