diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-10-11 21:27:17 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-10-11 21:27:17 +0200 |
| commit | 0bf9261e65b08cb54f43303c20d693649e16c079 (patch) | |
| tree | cfb53d634da666fbc75b3854199fd44201085bf9 /app/views | |
| parent | 3cc6255a7e01645799be7af01de0d7c2ec18832a (diff) | |
| parent | 6bc07d3de37f8bcfdd3324eb5aca05bee0e8d19c (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/home/index.html.haml | 6 | ||||
| -rwxr-xr-x | app/views/layouts/application.html.haml | 8 | ||||
| -rw-r--r-- | app/views/shared/_og.html.haml | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 3b4219c56..c3f5cb842 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,4 +1,10 @@ - content_for :header_tags do + %link{ href: asset_pack_path('features/getting_started.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ + %link{ href: asset_pack_path('features/compose.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ + %link{ href: asset_pack_path('features/home_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ + %link{ href: asset_pack_path('features/notifications.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ + %link{ href: asset_pack_path('features/community_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ + %link{ href: asset_pack_path('features/public_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key} %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e6190f7e2..24b74c787 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -20,14 +20,6 @@ = stylesheet_pack_tag 'common', media: 'all' = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous' - - %link{ href: asset_pack_path('features/getting_started.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ - %link{ href: asset_pack_path('features/compose.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ - %link{ href: asset_pack_path('features/home_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ - %link{ href: asset_pack_path('features/notifications.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ - %link{ href: asset_pack_path('features/community_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ - %link{ href: asset_pack_path('features/public_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/ - = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml index dbd476915..a6d805bea 100644 --- a/app/views/shared/_og.html.haml +++ b/app/views/shared/_og.html.haml @@ -1,6 +1,6 @@ - thumbnail = @instance_presenter.thumbnail = opengraph 'og:site_name', t('about.hosted_on', domain: site_hostname) -= opengraph 'og:url', about_url += opengraph 'og:url', url_for(only_path: false) = opengraph 'og:type', 'website' = opengraph 'og:title', @instance_presenter.site_title = opengraph 'og:description', strip_tags(@instance_presenter.site_description.presence || t('about.about_mastodon_html')) |