From d76463c3f20c68cd871404898298242780fae046 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 26 Feb 2013 05:24:56 +0100 Subject: [PATCH] Fix a few more UI issues --- assets/scripts/app/views.coffee | 4 ++-- assets/scripts/app/views/log.coffee | 4 ++-- assets/scripts/app/views/repo/show.coffee | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/assets/scripts/app/views.coffee b/assets/scripts/app/views.coffee index 7dce5884..3a732e8e 100644 --- a/assets/scripts/app/views.coffee +++ b/assets/scripts/app/views.coffee @@ -2,9 +2,9 @@ require 'ext/ember/namespace' @Travis.reopen View: Em.View.extend - popup: -> + popup: (name) -> @popupCloseAll() - name = if event.target then event.target.name else event + name = event?.target?.name || name $("##{name}").toggleClass('display') popupClose: -> $(event.target).closest('.popup').removeClass('display') diff --git a/assets/scripts/app/views/log.coffee b/assets/scripts/app/views/log.coffee index 67c23d26..afbc3d1b 100644 --- a/assets/scripts/app/views/log.coffee +++ b/assets/scripts/app/views/log.coffee @@ -63,7 +63,7 @@ Travis.reopen Travis.Urls.plainTextLog(id) if id = @get('log.job.id') ).property('job.log.id') - toggleTailing: (event) -> + toggleTailing: -> Travis.tailing.toggle() event.preventDefault() @@ -71,7 +71,7 @@ Travis.reopen $('#log').on 'mouseenter', 'a', -> $(this).attr('href', '#L' + ($(this.parentNode).prevAll('p').length + 1)) - click: (event) -> + click: -> if (href = $(event.target).attr('href')) && matches = href?.match(/#L(\d+)$/) @lineNumberClicked(matches[1]) event.stopPropagation() diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index 984992df..4bd1739a 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -130,11 +130,10 @@ Travis.reopen regenerateKey: -> @popupCloseAll() - self = this - @get('repo').regenerateKey - success: -> - self.popup('regeneration-success') + (@get('repo.content') || @get('repo')).regenerateKey + success: => + @popup('regeneration-success') error: -> Travis.app.router.flashController.loadFlashes([{ error: 'Travis encountered an error while trying to regenerate the key, please try again.'}])