Merge pull request #294 from zaggino/FezVrasta-git-ftp2

Merge of #288

Author: zaggino

htmlContent/git-panel.html

@@ -41,7 +41,6 @@
             <div class="btn-group git-available dropup">
                 <button type="button" class="git-remotes btn small dropdown-toggle" data-toggle="dropdown" title="{{TOOLTIP_PICK_REMOTE}}">
                     <span class="caret"></span>
-                    <span class="ftp-prefix">FTP: </span>
                     <span class="git-selected-remote">&mdash;</span>
                 </button>
                 <ul class="dropdown-menu git-remotes-dropdown"></ul>

htmlContent/git-remotes-picker.html

@@ -1,30 +1,10 @@
 <!-- List of remotes defined for the current local repository -->
-<li class="dropdown-header">{{Strings.GIT_REMOTES}}</li>
-{{#hasRemotes}}
 {{#remotes}}
 <li class="remote">
-    <a href="#" data-remote-name="{{name}}" data-is-gitftp="false">
+    <a href="#" data-remote-name="{{name}}" data-type="git" class="remote-name">
         {{#deletable}}<span class="trash-icon remove-remote">&times;</span>{{/deletable}}
         <span class="change-remote">{{name}}</span>
     </a>
 </li>
 {{/remotes}}
-{{/hasRemotes}}
 <li><a class="git-remote-new"><span>{{Strings.CREATE_NEW_REMOTE}}</span></a></li>
-
-<!-- List of Git-FTP remotes, used only if Git-FTP is available and enabled -->
-{{#gitFtpEnabled}}
-<li class="divider"></li>
-<li class="dropdown-header">{{Strings.GITFTP_REMOTES}}</li>
-{{#hasFtpRemotes}}
-{{#ftpRemotes}}
-<li class="gitftp-remote">
-    <a href="#" data-remote-name="{{name}}" data-is-gitftp="true">
-        <span class="trash-icon gitftp-remove-remote">&times;</span>
-        <span class="change-remote">{{name}}</span>
-    </a>
-</li>
-{{/ftpRemotes}}
-{{/hasFtpRemotes}}
-<li><a class="gitftp-remote-new"><span>{{Strings.CREATE_NEW_GITFTP_REMOTE}}</span></a></li>
-{{/gitFtpEnabled}}

less/brackets-git.less

@@ -259,19 +259,11 @@
         }
     }
 
-    [data-is-gitftp=true] .change-remote:before {
+    a[data-type=ftp] .change-remote:before, span[data-type=ftp]:before {
         content: "FTP:";
         padding-right: 5px;
         opacity: 0.5;
     }
-    .ftp-prefix {
-        display: none;
-        padding-right: 5px;
-        opacity: 0.5;
-        &[data-is-gitftp=true] {
-            display: inline;
-        }
-    }
 
     .dropdown-menu {
         border: none;

main.js

@@ -32,9 +32,12 @@ define(function (require, exports, module) {
         domainModulePath           = moduleDirectory + "src/Domains/cli",
         nodeConnection             = new NodeConnection();
 
-    // Load extension sources
-    require("src/Remotes");
-    require("src/Ftp"); // TODO: maybe only if FTP is enabled?
+    // Load extension modules that are not included by core
+    var modules = ["src/Remotes"];
+    if (Preferences.get("useGitFtp")) {
+        modules.push("src/Ftp/Ftp");
+    }
+    require(modules);
 
     // Seems just too buggy right now
     q.stopUnhandledRejectionTracking();

nls/root/strings.js

@@ -133,6 +133,7 @@ define({
     TOOLTIP_SHOW_HISTORY:               "Show history",
     TOOLTIP_PICK_REMOTE:                "Pick preferred remote",
     TOOLTIP_MORE:                       "More actions\u2026",
+    USER_ABORTED:                       "User aborted!",
     UNDO_CHANGES:                       "Discard changes",
     UNDO_LAST_LOCAL_COMMIT:             "Undo last local (not pushed) commit",
     URL:                                "URL",

src/Branch.js

@@ -122,7 +122,7 @@ define(function (require, exports) {
                             $this.prop("disabled", true).attr("title", "Already fetched");
                             _reloadBranchSelect($select, branches);
                         });
-                    }).fail(function (err) {
+                    }).catch(function (err) {
                         throw ErrorHandler.showError(err, "Fetching remote information failed");
                     });
                 });
@@ -138,7 +138,7 @@ define(function (require, exports) {
                             isRemote    = $option.attr("remote"),
                             track       = !!isRemote;
 
-                        Main.gitControl.createBranch(branchName, originName, track).fail(function (err) {
+                        Main.gitControl.createBranch(branchName, originName, track).catch(function (err) {
                             ErrorHandler.showError(err, "Creating new branch failed");
                         }).then(function () {
                             closeDropdown();
@@ -152,7 +152,7 @@ define(function (require, exports) {
         }).on("click", "a.git-branch-link .switch-branch", function (e) {
             e.stopPropagation();
             var branchName = $(this).parent().data("branch");
-            Main.gitControl.checkoutBranch(branchName).fail(function (err) {
+            Main.gitControl.checkoutBranch(branchName).catch(function (err) {
                 ErrorHandler.showError(err, "Switching branches failed");
             }).then(function () {
                 closeDropdown();
@@ -164,9 +164,9 @@ define(function (require, exports) {
         }).on("mouseleave", "a", function () {
             $(this).removeClass("selected");
         }).on("click", "a.git-branch-link .trash-icon", function () {
-            Main.gitControl.deleteLocalBranch($(this).parent().data("branch"))
-            .fail(function (err) { ErrorHandler.showError(err, "Branch deletion failed"); });
-            $(this).parent().remove();
+            Main.gitControl.deleteLocalBranch($(this).parent().data("branch")).catch(function (err) {
+                ErrorHandler.showError(err, "Branch deletion failed");
+            });
         }).on("click", ".merge-branch", function () {
             var fromBranch = $(this).parent().data("branch");
             doMerge(fromBranch);
@@ -203,7 +203,7 @@ define(function (require, exports) {
 
         Menus.closeAll();
 
-        Git.getBranches().fail(function (err) {
+        Git.getBranches().catch(function (err) {
             ErrorHandler.showError(err, "Getting branch list failed");
         }).then(function (branches) {
             branches = branches.reduce(function (arr, branch) {
@@ -262,7 +262,7 @@ define(function (require, exports) {
                     .on("click", toggleDropdown)
                     .append($("<span class='dropdown-arrow' />"));
                 Panel.enable();
-            }).fail(function (ex) {
+            }).catch(function (ex) {
                 if (ErrorHandler.contains(ex, "unknown revision")) {
                     $gitBranchName
                         .off("click")
@@ -272,7 +272,7 @@ define(function (require, exports) {
                     throw ex;
                 }
             });
-        }).fail(function (err) {
+        }).catch(function (err) {
             throw ErrorHandler.showError(err);
         });
     }

src/ErrorHandler.js

@@ -70,6 +70,10 @@ define(function (require, exports) {
         );
     };
 
+    exports.equals = function (err, what) {
+        return err.toString().toLowerCase() === what.toLowerCase();
+    };
+
     exports.contains = function (err, what) {
         return err.toString().toLowerCase().indexOf(what.toLowerCase()) !== -1;
     };

src/Events.js

@@ -28,5 +28,6 @@ define(function (require, exports) {
     exports.PULL_FINISHED = "pull.finished";
     exports.PUSH_STARTED = "push.started";
     exports.PUSH_FINISHED = "push.finished";
+    exports.REMOTES_REFRESH_PICKER = "remotes.refresh.picker";
 
 });