From 3aca556827de89d26cabf7b370d06098cfa4dcc5 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Thu, 27 Jun 2013 10:09:03 -0700 Subject: [PATCH] Simplify tab clicking --- .../config-view/lib/package-panel.coffee | 20 +++++++------------ .../spec/package-panel-spec.coffee | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/packages/config-view/lib/package-panel.coffee b/src/packages/config-view/lib/package-panel.coffee index 73145ce81..c3a0d2ff9 100644 --- a/src/packages/config-view/lib/package-panel.coffee +++ b/src/packages/config-view/lib/package-panel.coffee @@ -19,10 +19,10 @@ class PackagePanel extends ConfigPanel @div class: 'package-panel', => @legend 'Packages' @ul class: 'nav nav-tabs', => - @li class: 'active', outlet: 'installedLink', => + @li class: 'active', => @a 'Installed', => @span class: 'badge pull-right', outlet: 'installedCount' - @li outlet: 'availableLink', => + @li => @a 'Available', => @span class: 'badge pull-right', outlet: 'availableCount' @@ -37,17 +37,11 @@ class PackagePanel extends ConfigPanel @loadInstalledViews() @loadAvailableViews() - @installedLink.on 'click', => - @availableLink.removeClass('active') - @availablePackages.hide() - @installedLink.addClass('active') - @installedPackages.show() - - @availableLink.on 'click', => - @installedLink.removeClass('active') - @installedPackages.hide() - @availableLink.addClass('active') - @availablePackages.show() + @find('.nav-tabs li').on 'click', (event) => + return if $(event.currentTarget).hasClass('active') + @find('.nav-tabs li').toggleClass('active') + @availablePackages.toggle() + @installedPackages.toggle() @packageEventEmitter.on 'package-installed', (error, pack) => @addInstalledPackage(pack) unless error? diff --git a/src/packages/config-view/spec/package-panel-spec.coffee b/src/packages/config-view/spec/package-panel-spec.coffee index c6123647f..bd7f1128e 100644 --- a/src/packages/config-view/spec/package-panel-spec.coffee +++ b/src/packages/config-view/spec/package-panel-spec.coffee @@ -111,7 +111,7 @@ describe "PackagePanel", -> describe 'Available tab', -> it 'lists all available packages', -> - panel.availableLink.click() + panel.find("li a:contains(Available)").click() panel.attachToDom() expect(panel.availablePackages.children('.panel').length).toBe 3