app/js/lib/views/base_app.coffee in ela-3.4.3 vs app/js/lib/views/base_app.coffee in ela-4.0.0
- old
+ new
@@ -27,11 +27,12 @@
'tap header *[data-toggle-aside]': 'setCurrentAside'
'tap header .poised.subviews.select': 'viewSubviewOptions'
'tap header .poised.subviews.select .option.subapp': 'openSubapp'
'tap header .poised.subviews.select .option.layout': 'openLayout'
'tap header .context.icon': 'toggleContextMenu'
- 'tap article.graph:has(~ aside.active)': 'hideAsides'
+ 'tap article.viewport:has(~ aside.active)': 'hideAsides'
+ 'tap article.viewport:has(~ .headup.active)': 'hideHeadup'
'tap section:has(.subviews.select.view)': 'hideSubappOptions'
'tap section:has(.menu.view)': 'hideMenus'
hammerjs: true
@@ -39,12 +40,12 @@
@$el.afterTransitionForRemovingClass 'active', => super
initialize: ->
@listenTo @model, 'change:currentAside', @toggleAside
@listenTo @model, 'change:showHelp', @renderHelp
- @on 'controlLiveChangeStart', @liveChangeStart
- @on 'controlLiveChangeEnd', @liveChangeEnd
+ @on 'controlLiveChangeStart', @showHeadup
+ @on 'controlLiveChangeEnd', @hideHeadup
for aside in @asides
aside.link ?= 'icon'
@layouts ?=
@@ -148,18 +149,23 @@
@$("aside.#{previous}").toggleClass('active', false)
if value?
@$("header .#{value}.aside.icon").toggleClass('active', true)
@$("aside.#{value}").toggleClass('active', true)
- liveChangeStart: (slider) =>
- if $(window).width() <= 768
- @$('aside.active').addClass('hidden')
- @subviews.headup.activate(slider)
+ showHeadup: (control, options = {}) =>
+ options.mobileOnly ?= true
+ isMobile = $(window).width() <= 768
+ if isMobile or not options.mobileOnly
+ if isMobile
+ @$('aside.active').addClass('hidden')
+ else
+ @model.set('currentAside', null)
- liveChangeEnd: =>
- if $(window).width() <= 768
- @$('aside.active').removeClass('hidden')
- @subviews.headup.deactivate()
+ @subviews.headup.activate(control)
+
+ hideHeadup: =>
+ @$('aside.active').removeClass('hidden')
+ @subviews.headup.deactivate()
setActive: (active) =>
@$el.toggleClass('active', active)
activate: =>