Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed not needed controller. Improved App.ControllerTabs and App.ControllerNavSidbar.

Browse source
This commit is contained in:
Martin Edenhofer 2015-11-18 14:25:54 +01:00
parent 341088625b
commit c1ae11139f
1 changed files with 43 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
app/assets/javascripts/app/controllers/_application_controller_generic.coffee
View file

@ -170,7 +170,7 @@ class App.ControllerGenericIndex extends App.Controller
# append content table # append content table
params = _.extend( params = _.extend(
{ {
el: @el.find('.table-overview') el: @$('.table-overview')
model: App[ @genericObject ] model: App[ @genericObject ]
objects: objects objects: objects
bindRow: bindRow:
@ -301,9 +301,9 @@ class App.ControllerDrox extends App.Controller
inline: (data) -> inline: (data) ->
@html App.view('generic/drox')(data) @html App.view('generic/drox')(data)
if data.text if data.text
@el.find('.drox-body').text(data.text) @$('.drox-body').text(data.text)
if data.html if data.html
@el.find('.drox-body').html(data.html) @$('.drox-body').html(data.html)
template: (data) -> template: (data) ->
drox = $( App.view('generic/drox')(data) ) drox = $( App.view('generic/drox')(data) )
@ -311,50 +311,6 @@ class App.ControllerDrox extends App.Controller
drox.find('.drox-body').append(content) drox.find('.drox-body').append(content)
drox drox
class App.ControllerLevel2 extends App.ControllerContent
events:
'click [data-toggle="tabnav"]': 'toggle',
constructor: ->
super
render: ->
# set title
@title @page.title
@navupdate @page.nav
@html App.view('generic/admin_level2/index')(
page: @page
menus: @menu
type: @type
target: @target
)
if !@target
@target = @menu[0]['target']
for menu in @menu
@el.find('.nav-tab-content').append('<div class="tabbable" id="' + menu.target + '"></div>')
if menu.controller && ( @toggleable is true || ( @toggleable is false && menu.target is @target ) )
params = menu.params || {}
params.el = @el.find( '#' + menu.target )
new menu.controller( params )
@el.find('.tabbable').addClass('hide')
@el.find( '#' + @target ).removeClass('hide')
@el.find('[data-toggle="tabnav"][href*="/' + @target + '"]').parent().addClass('active')
toggle: (e) ->
return true if @toggleable is false
e.preventDefault()
target = $(e.target).data('target')
$(e.target).parents('ul').find('li').removeClass('active')
$(e.target).parents('li').addClass('active')
@el.find('.tabbable').addClass('hide')
@el.find('#' + target).removeClass('hide')
# window.scrollTo(0,0)
class App.ControllerTabs extends App.Controller class App.ControllerTabs extends App.Controller
events: events:
'click .nav-tabs [data-toggle="tab"]': 'tabRemember', 'click .nav-tabs [data-toggle="tab"]': 'tabRemember',
@ -372,24 +328,25 @@ class App.ControllerTabs extends App.Controller
# insert content # insert content
for tab in @tabs for tab in @tabs
@el.find('.tab-content').append("<div class=\"tab-pane\" id=\"#{tab.target}\"></div>") @$('.tab-content').append("<div class=\"tab-pane\" id=\"#{tab.target}\"></div>")
if tab.controller if tab.controller
params = tab.params || {} params = tab.params || {}
params.name = tab.name params.name = tab.name
params.target = tab.target params.target = tab.target
params.el = @el.find( "##{tab.target}" ) params.el = @$( "##{tab.target}" )
new tab.controller( params ) new tab.controller( params )
# check if tabs need to be hidden # check if tabs need to be show / cant' use .tab(), because tabs are note shown (only one tab exists)
# if @tabs.length <= 1 if @tabs.length <= 1
# @el.find('.page-tabs').addClass('hide') @$('.tab-pane').addClass('active')
return
# set last or first tab to active # set last or first tab to active
@lastActiveTab = @Config.get('lastTab') @lastActiveTab = @Config.get('lastTab')
if @lastActiveTab && @el.find(".nav-tabs li a[href=#{@lastActiveTab}]")[0] if @lastActiveTab && @$(".nav-tabs li a[href=#{@lastActiveTab}]")[0]
@el.find(".nav-tabs li a[href=#{@lastActiveTab}]").tab('show') @$(".nav-tabs li a[href=#{@lastActiveTab}]").tab('show')
else else
@el.find('.nav-tabs li:first a').tab('show') @$('.nav-tabs li:first a').tab('show')
tabRemember: (e) => tabRemember: (e) =>
@lastActiveTab = $(e.target).attr('href') @lastActiveTab = $(e.target).attr('href')
@ -439,15 +396,22 @@ class App.ControllerNavSidbar extends App.ControllerContent
else else
item.active = false item.active = false
@render(selectedItem) @renderContainer(selectedItem)
@renderNavBar(selectedItem)
@bind( @bind(
'ui:rerender' 'ui:rerender'
=> =>
@render(selectedItem, true) @renderNavBar(selectedItem)
) )
render: (selectedItem, force) => renderContainer: =>
return if $( ".#{@configKey}" )[0]
@html App.view('generic/navbar_level2/index')(
className: @configKey
)
renderNavBar: (selectedItem) =>
# remember latest selected item # remember latest selected item
selectedItemMeta = selectedItemMeta =
@ -455,17 +419,24 @@ class App.ControllerNavSidbar extends App.ControllerContent
date: new Date date: new Date
App.Config.set("Runtime::#{@configKey}", selectedItemMeta) App.Config.set("Runtime::#{@configKey}", selectedItemMeta)
if !$( ".#{@configKey}" )[0] || force @$('.sidebar').html App.view('generic/navbar_level2/navbar')(
@html App.view('generic/navbar_l2')(
groups: @groupsSorted groups: @groupsSorted
className: @configKey className: @configKey
) )
if selectedItem if selectedItem
@el.find('li').removeClass('active') @$('li').removeClass('active')
@el.find("a[href=\"#{selectedItem.target}\"]").parent().addClass('active') @$("a[href=\"#{selectedItem.target}\"]").parent().addClass('active')
@executeController(selectedItem)
new selectedItem.controller( executeController: (selectedItem) =>
el: @el.find('.main')
# in case of rerendering
if @activeController && @activeController.render
@activeController.render()
return
@activeController = new selectedItem.controller(
el: @$('.main')
) )
class App.GenericHistory extends App.ControllerModal class App.GenericHistory extends App.ControllerModal
@ -580,7 +551,7 @@ class App.ActionRow extends App.Controller
for item in @items for item in @items
do (item) => do (item) =>
@el.find('[data-type="' + item.name + '"]').on( @$('[data-type="' + item.name + '"]').on(
'click', 'click',
(e) -> (e) ->
e.preventDefault() e.preventDefault()
@ -624,13 +595,13 @@ class App.Sidebar extends App.Controller
# init content callback # init content callback
for item in @items for item in @items
if item.callback if item.callback
item.callback( @el.find( '.sidebar[data-tab="' + item.name + '"] .sidebar-content' ) ) item.callback( @$( '.sidebar[data-tab="' + item.name + '"] .sidebar-content' ) )
# add item acctions # add item acctions
for item in @items for item in @items
if item.actions if item.actions
new App.ActionRow( new App.ActionRow(
el: @el.find('.sidebar[data-tab="' + item.name + '"] .js-actions') el: @$('.sidebar[data-tab="' + item.name + '"] .js-actions')
items: item.actions items: item.actions
type: 'small' type: 'small'
) )
@ -675,13 +646,13 @@ class App.Sidebar extends App.Controller
@tabs.removeClass('active') @tabs.removeClass('active')
# add active state # add active state
@el.find('.tabsSidebar-tab[data-tab=' + name + ']').addClass('active') @$('.tabsSidebar-tab[data-tab=' + name + ']').addClass('active')
# hide all content tabs # hide all content tabs
@sidebars.addClass('hide') @sidebars.addClass('hide')
# show active tab content # show active tab content
tabContent = @el.find('.sidebar[data-tab=' + name + ']') tabContent = @$('.sidebar[data-tab=' + name + ']')
tabContent.removeClass('hide') tabContent.removeClass('hide')
# remember current tab # remember current tab