Close popups and menus when clicking outside of them
This commit is contained in:
parent
e997ac7f6a
commit
b142d3cdcf
|
@ -16,7 +16,16 @@ require 'ext/ember/namespace'
|
||||||
AuthLayoutView: Travis.View.extend(templateName: 'layouts/simple')
|
AuthLayoutView: Travis.View.extend(templateName: 'layouts/simple')
|
||||||
ProfileLayoutView: Travis.View.extend(templateName: 'layouts/profile')
|
ProfileLayoutView: Travis.View.extend(templateName: 'layouts/profile')
|
||||||
StatsLayoutView: Travis.View.extend(templateName: 'layouts/simple')
|
StatsLayoutView: Travis.View.extend(templateName: 'layouts/simple')
|
||||||
ApplicationView: Travis.View.extend(templateName: 'application')
|
ApplicationView: Travis.View.extend
|
||||||
|
templateName: 'application'
|
||||||
|
click: (event) ->
|
||||||
|
# TODO: this solves the case of closing menus and popups,
|
||||||
|
# but I would like to rewrite it later, not sure how
|
||||||
|
# yet, but this does not seem optimal
|
||||||
|
if ! $(event.target).parents().andSelf().hasClass('popup')
|
||||||
|
@popupCloseAll()
|
||||||
|
if ! $(event.target).parents().andSelf().hasClass('menu')
|
||||||
|
$('.menu').removeClass('display')
|
||||||
|
|
||||||
require 'views/accounts'
|
require 'views/accounts'
|
||||||
require 'views/build'
|
require 'views/build'
|
||||||
|
|
|
@ -68,9 +68,10 @@
|
||||||
closeMenu: ->
|
closeMenu: ->
|
||||||
$('.menu').removeClass('display')
|
$('.menu').removeClass('display')
|
||||||
|
|
||||||
menu: ->
|
menu: (event) ->
|
||||||
@popupCloseAll()
|
@popupCloseAll()
|
||||||
element = $('#tools .menu').toggleClass('display')
|
element = $('#tools .menu').toggleClass('display')
|
||||||
|
event.stopPropagation()
|
||||||
|
|
||||||
requeue: ->
|
requeue: ->
|
||||||
@closeMenu()
|
@closeMenu()
|
||||||
|
@ -80,6 +81,7 @@
|
||||||
@set('active', true)
|
@set('active', true)
|
||||||
@closeMenu()
|
@closeMenu()
|
||||||
@popup(event)
|
@popup(event)
|
||||||
|
event.stopPropagation()
|
||||||
|
|
||||||
canPush: (->
|
canPush: (->
|
||||||
@get('isBuildTab') && @get('build.isFinished') && @get('hasPushPermissions')
|
@get('isBuildTab') && @get('build.isFinished') && @get('hasPushPermissions')
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
||||||
13b44fe6
|
a3466403
|
Loading…
Reference in New Issue
Block a user