diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9e840f7f..d78e69ec 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -30,7 +30,6 @@ //= require osem-datepickers //= require osem-datatables //= require osem-tickets -//= require transifex-live $(document).ready(function() { $('a[disabled=disabled]').click(function(event){ diff --git a/app/assets/javascripts/transifex-live.js b/app/assets/javascripts/transifex-live.js deleted file mode 100644 index a93b35ac..00000000 --- a/app/assets/javascripts/transifex-live.js +++ /dev/null @@ -1,6 +0,0 @@ -window.liveSettings = { - api_key: CONFIG['transifex_live_api_key'], - picker: "bottom-right", - detectlang: true, - autocollect: true -}; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 775140b3..2567eaab 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -8,14 +8,22 @@ = stylesheet_link_tag "application", :media => "all" = stylesheet_link_tag "splash" if content_for :splash = javascript_include_tag "application" - = javascript_include_tag "//cdn.transifex.com/live.js" = csrf_meta_tags :javascript + window.liveSettings = { + api_key: "<%= CONFIG['transifex_live_api_key'] %>", + picker: "bottom-right", + detectlang: true, + autocollect: true + }; + $(function() { $('.dropdown input, .dropdown label').click(function(e) { e.stopPropagation(); }); }); + + = javascript_include_tag "//cdn.transifex.com/live.js" = yield(:head) %body{ data: (content_for?(:splash_nav) ? {spy: 'scroll', offset: 0, target: 'splash-nav'} : {} ) } = render 'layouts/navigation'