diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-09 10:39:10 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-09 10:39:10 +0000 |
| commit | 18e33e037f15810a5a767522155d46839db94d50 (patch) | |
| tree | 7b8d4988b0defa832db405b5abaa8b834766ebbe | |
| parent | 378904d6288a96013ff1994f011f2f21ebd67c18 (diff) | |
| parent | eb80edd34f6b2230e67b71392eb92e63b61a2d5f (diff) | |
| download | gitlab-ce-18e33e037f15810a5a767522155d46839db94d50.tar.gz | |
Merge branch 'fix-missing-js' into 'master'
Move page-specific JS out of head and into body.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2375.
See merge request !787
| -rw-r--r-- | app/views/layouts/_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 4d8c5656a25..dbc68c39bf1 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -20,5 +20,3 @@ = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id') = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id') = render 'layouts/bootlint' if Rails.env.development? - - = yield :scripts_head diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ff23913d7d6..173033f7eab 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -2,6 +2,9 @@ %html{ lang: "en"} = render "layouts/head" %body{class: "#{app_theme}", :'data-page' => body_data_page} + / Ideally this would be inside the head, but turbolinks only evaluates page-specific JS in the body. + = yield :scripts_body_top + - if current_user = render "layouts/header/default", title: header_title - else diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 03c7ba8c73f..44afa33dfe5 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -2,8 +2,8 @@ - header_title project_title(@project) - sidebar "project" unless sidebar -- content_for :scripts_head do - -if current_user +- content_for :scripts_body_top do + - if current_user :javascript window.project_uploads_path = "#{namespace_project_uploads_path @project.namespace, @project}"; window.markdown_preview_path = "#{markdown_preview_namespace_project_path(@project.namespace, @project)}"; |