Unverified Commit 2ca42ea5 authored by Justin Ramos's avatar Justin Ramos Committed by Steffen van Bergerem
Browse files

adding content_for(:javascript)

closes #7209
parent 6c6f9bb9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
* Don't display mail-related view content if it is disabled in the pod's config [#7190](https://github.com/diaspora/diaspora/pull/7190)
* Use typeahead.js from rails-assets.org [#7192](https://github.com/diaspora/diaspora/pull/7192)
* Refactor ShareVisibilitesController to use PostService [#7196](https://github.com/diaspora/diaspora/pull/7196)
* Unify desktop and mobile head elements [#7194](https://github.com/diaspora/diaspora/pull/7194)
* Unify desktop and mobile head elements [#7194](https://github.com/diaspora/diaspora/pull/7194) [#7209](https://github.com/diaspora/diaspora/pull/7209)
* Refactor flash messages on ajax errors for comments, likes, reshares and aspect memberships [#7202](https://github.com/diaspora/diaspora/pull/7202)
* Only require AWS-module for fog [#7201](https://github.com/diaspora/diaspora/pull/7201)
* Only show community spotlight links on the contacts page if community spotlight is enabled [#7213](https://github.com/diaspora/diaspora/pull/7213)
+6 −6
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@
/ All others
%link{rel: "shortcut icon", href: image_path("favicon.png")}

= chartbeat_head_block
= include_mixpanel

- if rtl?
  = stylesheet_link_tag :rtl, media: "all"

@@ -22,9 +19,12 @@
  = stylesheet_link_tag :poltergeist_disable_transition, media: "all"

= jquery_include_tag
= include_gon(camel_case: true, nonce: content_security_policy_nonce(:script))
= yield(:javascript)

= chartbeat_head_block
= csrf_meta_tag
= current_user_atom_tag
= include_mixpanel

= yield(:head)

= csrf_meta_tag
= include_gon(camel_case: true, nonce: content_security_policy_nonce(:script))
+10 −8
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@
!!!
%html{lang: I18n.locale.to_s, dir: (rtl? ? "rtl" : "ltr")}
  %head{prefix: og_prefix}
    = render "head"
    %meta{name: "viewport", content: "width=device-width, initial-scale=1"}/

    = include_color_theme
    - content_for :javascript do
      = old_browser_js_support

      <!--[if IE]>
@@ -17,6 +16,9 @@

      = javascript_include_tag :main, :templates
      = load_javascript_locales

    = render "head"
    = include_color_theme
    = translation_missing_warnings

  %body{class: "page-#{controller_name} action-#{action_name}"}
+4 −2
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@
!!!
%html{lang: I18n.locale.to_s, dir: (rtl? ? "rtl" : "ltr")}
  %head{prefix: og_prefix}
    - content_for :javascript do
      = javascript_include_tag "mobile/mobile"
      = load_javascript_locales

    = render "head"
    = include_color_theme "mobile"

@@ -30,7 +34,5 @@
            = t("streams.activity.title")
        = yield

    = javascript_include_tag "mobile/mobile"
    = load_javascript_locales
    = include_chartbeat
    = include_mixpanel_guid