Removed obsolete status bar (#110)

brackets-userland · Feb 12, 2014 · 842ad77 · 842ad77
1 parent 48ae9df
commit 842ad77
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 0.8.9
 * Do not display 'not a git repo' anymore [#111](https://github.com/zaggino/brackets-git/issues/111)
+* Removed obsolete status bar [#110](https://github.com/zaggino/brackets-git/issues/110)
 
 ## 0.8.8
 * Add toggle panel keyboard shortcut in settings dialog.

diff --git a/less/brackets-git.less b/less/brackets-git.less
@@ -94,16 +94,6 @@
     background-color: @lighterRed;
 }
 
-#git-status.error
-{
-    color: red;
-}
-
-#git-status.clickable
-{
-    cursor: pointer;
-}
-
 #git-branch-dropdown-toggle
 {
     display: inline-block;

diff --git a/src/Main.js b/src/Main.js
@@ -24,30 +24,7 @@ define(function (require, exports) {
     var $icon                   = $("<a id='git-toolbar-icon' href='#'></a>").attr("title", Strings.LOADING)
                                     .addClass("loading").appendTo($("#main-toolbar .buttons")),
         gitControl              = null,
-        preferences             = null,
-        // shows detected git version in the status bar
-        $gitStatusBar           = $(null),
-        // show busy icon in status bar when git operation is running
-        $busyIndicator          = $(null),
-        busyIndicatorIndex      = 0,
-        busyIndicatorInProgress = [];
-
-    function showBusyIndicator() {
-        var i = busyIndicatorIndex++;
-        busyIndicatorInProgress.push(i);
-        $busyIndicator.addClass("spin");
-        return i;
-    }
-
-    function hideBusyIndicator(i) {
-        var pos = busyIndicatorInProgress.indexOf(i);
-        if (pos !== -1) {
-            busyIndicatorInProgress.splice(pos, 1);
-        }
-        if (busyIndicatorInProgress.length === 0) {
-            $busyIndicator.removeClass("spin");
-        }
-    }
+        preferences             = null;
 
     function getProjectRoot() {
         return ProjectManager.getProjectRoot().fullPath;
@@ -79,19 +56,6 @@ define(function (require, exports) {
         return result.promise;
     }
 
-    // Shows currently installed version or error when Git is not available
-    function initGitStatusBar() {
-        return gitControl.getVersion().then(function (version) {
-            Strings.GIT_VERSION = version;
-            $gitStatusBar.text("Git " + version);
-        }).fail(function (err) {
-            var errText = Strings.CHECK_GIT_SETTINGS + ": " + err.toString();
-            $gitStatusBar.addClass("error").text(errText);
-            $icon.addClass("error").attr("title", errText);
-            throw err;
-        });
-    }
-
     // This only launches, when bash is available
     function initBashIcon() {
         $("<a id='git-bash'>[ bash ]</a>")
@@ -302,7 +266,6 @@ define(function (require, exports) {
             preferences: preferences,
             handler: function (method, cmd, args, opts) {
                 var rv = q.defer(),
-                    i = showBusyIndicator(),
                     resolved = false;
 
                 opts = opts || {};
@@ -328,7 +291,6 @@ define(function (require, exports) {
                         }
                     })
                     .always(function () {
-                        hideBusyIndicator(i);
                         resolved = true;
                     })
                     .done();
@@ -338,7 +300,6 @@ define(function (require, exports) {
                         var err = new Error("cmd-" + method + "-timeout: " + cmd + " " + args.join(" "));
                         ErrorHandler.logError(err);
                         rv.reject(err);
-                        hideBusyIndicator(i);
                         resolved = true;
                     }
                 }, opts.timeout || TIMEOUT_VALUE);
@@ -349,15 +310,23 @@ define(function (require, exports) {
         // Initialize items dependent on HTML DOM
         AppInit.htmlReady(function () {
             $icon.removeClass("loading").removeAttr("title");
-            $gitStatusBar  = $("<div id='git-status'></div>").appendTo($("#status-indicators"));
-            $busyIndicator = $("<div class='spinner'></div>").appendTo($gitStatusBar);
-            initGitStatusBar().then(function () {
+
+            // Try to get Git version, if succeeds then Git works
+            gitControl.getVersion().then(function (version) {
+                Strings.GIT_VERSION = version;
                 initUi();
                 attachEventsToBrackets();
-            });
+            }).fail(function (err) {
+                var errText = Strings.CHECK_GIT_SETTINGS + ": " + err.toString();
+                $icon.addClass("error").attr("title", errText);
+                throw err;
+            }).done();
+
+            // Try to get Bash version, if succeeds then Bash is available
             gitControl.bashVersion().then(function () {
                 initBashIcon();
             });
+
             // add command to project menu
             var projectCmenu = Menus.getContextMenu(Menus.ContextMenuIds.PROJECT_MENU);
             var workingCmenu = Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_MENU);

diff --git a/src/Panel.js b/src/Panel.js
@@ -732,9 +732,6 @@ define(function (require, exports) {
         var menu = Menus.getMenu(Menus.AppMenuBar.VIEW_MENU);
         menu.addMenuDivider();
         menu.addMenuItem(PANEL_COMMAND_ID, Main.preferences.getValue("panelShortcut"));
-
-        // Make Git in status bar clickable
-        $("#git-status").addClass("clickable").on("click", toggle);
     }
 
     function enable() {