diff options
| author | Robert | 2017-04-24 14:16:52 +0200 |
|---|---|---|
| committer | Robert | 2017-04-24 14:16:52 +0200 |
| commit | 2d19e65fa8d8ac037c7f00a638111788b7ee002c (patch) | |
| tree | 830fe41ac13743f75f2c16f41dfd1ff399b99a9b /app/assets/javascripts/main_menu.coffee | |
| parent | 5003acfc533baa824fed11cf6f82f86393b3a0f6 (diff) | |
| parent | 1cbed80c913420c76ac7d3716b9d8c4bf4e14278 (diff) | |
| download | chouette-core-2d19e65fa8d8ac037c7f00a638111788b7ee002c.tar.bz2 | |
conflict resolution and asset recompilation
Diffstat (limited to 'app/assets/javascripts/main_menu.coffee')
| -rw-r--r-- | app/assets/javascripts/main_menu.coffee | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/main_menu.coffee b/app/assets/javascripts/main_menu.coffee index 9357cff34..2e0cd3470 100644 --- a/app/assets/javascripts/main_menu.coffee +++ b/app/assets/javascripts/main_menu.coffee @@ -1,4 +1,4 @@ -$(document).on 'ready page:load', -> +$(document).on 'turbolinks:load', -> link = [] ptitleCont = "" @@ -49,5 +49,6 @@ $(document).on 'ready page:load', -> $('#main_nav').removeClass 'sticky' if $('#menu_top').find('.sticky-content').length > 0 - $('.page-action .small').after(link) + if !$('.page-action').find('.formSubmitr').length + $('.page-action .small').after(link) $('.sticky-content').remove() |