Fix a few more UI issues

This commit is contained in:
Piotr Sarnacki 2013-02-26 05:24:56 +01:00
parent 65eb4e15fb
commit d76463c3f2
3 changed files with 7 additions and 8 deletions

View File

@ -2,9 +2,9 @@ require 'ext/ember/namespace'
@Travis.reopen @Travis.reopen
View: Em.View.extend View: Em.View.extend
popup: -> popup: (name) ->
@popupCloseAll() @popupCloseAll()
name = if event.target then event.target.name else event name = event?.target?.name || name
$("##{name}").toggleClass('display') $("##{name}").toggleClass('display')
popupClose: -> popupClose: ->
$(event.target).closest('.popup').removeClass('display') $(event.target).closest('.popup').removeClass('display')

View File

@ -63,7 +63,7 @@ Travis.reopen
Travis.Urls.plainTextLog(id) if id = @get('log.job.id') Travis.Urls.plainTextLog(id) if id = @get('log.job.id')
).property('job.log.id') ).property('job.log.id')
toggleTailing: (event) -> toggleTailing: ->
Travis.tailing.toggle() Travis.tailing.toggle()
event.preventDefault() event.preventDefault()
@ -71,7 +71,7 @@ Travis.reopen
$('#log').on 'mouseenter', 'a', -> $('#log').on 'mouseenter', 'a', ->
$(this).attr('href', '#L' + ($(this.parentNode).prevAll('p').length + 1)) $(this).attr('href', '#L' + ($(this.parentNode).prevAll('p').length + 1))
click: (event) -> click: ->
if (href = $(event.target).attr('href')) && matches = href?.match(/#L(\d+)$/) if (href = $(event.target).attr('href')) && matches = href?.match(/#L(\d+)$/)
@lineNumberClicked(matches[1]) @lineNumberClicked(matches[1])
event.stopPropagation() event.stopPropagation()

View File

@ -130,11 +130,10 @@ Travis.reopen
regenerateKey: -> regenerateKey: ->
@popupCloseAll() @popupCloseAll()
self = this
@get('repo').regenerateKey (@get('repo.content') || @get('repo')).regenerateKey
success: -> success: =>
self.popup('regeneration-success') @popup('regeneration-success')
error: -> error: ->
Travis.app.router.flashController.loadFlashes([{ error: 'Travis encountered an error while trying to regenerate the key, please try again.'}]) Travis.app.router.flashController.loadFlashes([{ error: 'Travis encountered an error while trying to regenerate the key, please try again.'}])