Skip to content

Allow for default_locale to be nil #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Allow for default_locale to be nil #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions app/assets/javascripts/active_admin/active_admin_globalize.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ $ ->
$tab.addClass('hidden').hide().addClass('hidden')
$addButton.show().removeClass('hidden')

switchToTab = ($tab, $tabs, $contents) ->
if $tab && $tab.length > 0
$tab.eq(0).click()
else
$tabs.removeClass("active")
$contents.hide()

$(".activeadmin-translations > ul").each ->
$dom = $(this)
# true when tabs are used in show action, false in form
Expand All @@ -40,8 +47,6 @@ $ ->
$contents.filter($tab.attr("href")).show()
e.preventDefault()

$tabs.eq(0).click()

# Add button and other behavior is not needed in show action
return if showAction

Expand Down Expand Up @@ -70,7 +75,7 @@ $ ->
$tab = $(this).parent()
toggleTab($tab, false)
if $tab.hasClass('active')
$tabs.not('.hidden').eq(0).click()
switchToTab $tabs.not('.hidden').eq(0), $tabs, $contents

updateLocaleButtonsStatus($dom)

Expand Down Expand Up @@ -133,7 +138,9 @@ $ ->

#Initially update the buttons' status
updateLocaleButtonsStatus($dom)
$tabs.filter('.default').click()
$nextActiveTab = $tabs.filter('.default')
$nextActiveTab = $tabs.filter(':not(.hidden)').eq(0) if !$nextActiveTab.length
switchToTab $nextActiveTab, $tabs, $contents

# this is to handle elements created with has_many
$("a").bind "click", ->
Expand Down