From f632f8a1f8fef3e7c9303c2ef373d72b929994aa Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Fri, 16 Mar 2018 13:27:18 +0200
Subject: [PATCH] Include templates to main.js
This is needed to properly initialize Handlebars partials without
a document ready handler.
fixes #7739
closes #7740
---
Changelog.md | 1 +
app/assets/config/manifest.js | 1 -
app/assets/javascripts/app/helpers/handlebars-partials.js | 5 +----
app/assets/javascripts/jasmine-load-all.js | 1 -
app/assets/javascripts/main.js | 1 +
app/assets/javascripts/templates.js | 5 -----
app/views/layouts/application.html.haml | 2 +-
7 files changed, 4 insertions(+), 12 deletions(-)
delete mode 100644 app/assets/javascripts/templates.js
diff --git a/Changelog.md b/Changelog.md
index d69b4e5d48..427af0abab 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@
## Bug fixes
* Prefill conversation form on contacts page only with mutual contacts [#7744](https://github.com/diaspora/diaspora/pull/7744)
+* Fix profiles sometimes not loading properly in background tabs [#7740](https://github.com/diaspora/diaspora/pull/7740)
## Features
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index 2347fce180..fc75a31f61 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -6,7 +6,6 @@
//= link bookmarklet.js
//= link mobile/bookmarklet.js
//= link mobile/mobile.js
-//= link templates.js
//= link error_pages.css
//= link admin.css
//= link rtl.css
diff --git a/app/assets/javascripts/app/helpers/handlebars-partials.js b/app/assets/javascripts/app/helpers/handlebars-partials.js
index 6f18152291..3f9b354eb1 100644
--- a/app/assets/javascripts/app/helpers/handlebars-partials.js
+++ b/app/assets/javascripts/app/helpers/handlebars-partials.js
@@ -1,7 +1,4 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-/* we need to wrap this in a document ready to ensure JST is accessible */
-$(function(){
- Handlebars.registerPartial('status-message', HandlebarsTemplates['status-message_tpl']);
-});
+Handlebars.registerPartial("status-message", HandlebarsTemplates["status-message_tpl"]);
// @license-end
diff --git a/app/assets/javascripts/jasmine-load-all.js b/app/assets/javascripts/jasmine-load-all.js
index b465abdadc..fe771027cb 100644
--- a/app/assets/javascripts/jasmine-load-all.js
+++ b/app/assets/javascripts/jasmine-load-all.js
@@ -1,6 +1,5 @@
//= require jquery3
//= require handlebars.runtime
-//= require templates
//= require main
//= require fine-uploader/fine-uploader.core
//= require mobile/mobile
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index ee4fc5e7f7..8c139dc40f 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -18,6 +18,7 @@
//= require jquery.autoSuggest.custom
//= require fine-uploader/fine-uploader.core
//= require handlebars.runtime
+//= require_tree ../templates
//= require posix-bracket-expressions
//= require markdown-it
//= require markdown-it-diaspora-mention
diff --git a/app/assets/javascripts/templates.js b/app/assets/javascripts/templates.js
deleted file mode 100644
index b46d3dab23..0000000000
--- a/app/assets/javascripts/templates.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Copyright (c) 2010-2011, Diaspora Inc. This file is
- * licensed under the Affero General Public License version 3 or later. See
- * the COPYRIGHT file.
- */
-//= require_tree ../templates
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a55a832e63..a50e428aaf 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -8,7 +8,7 @@
%meta{name: "viewport", content: "width=device-width, initial-scale=1"}/
- content_for :javascript do
- = javascript_include_tag :main, :templates
+ = javascript_include_tag :main
= load_javascript_locales
= include_color_theme
--
GitLab