Include templates to main.js
This is needed to properly initialize Handlebars partials without a document ready handler. fixes #7739 closes #7740
This commit is contained in:
parent
bc3908a103
commit
f632f8a1f8
7 changed files with 4 additions and 12 deletions
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
## Bug fixes
|
## Bug fixes
|
||||||
* Prefill conversation form on contacts page only with mutual contacts [#7744](https://github.com/diaspora/diaspora/pull/7744)
|
* 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
|
## Features
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
//= link bookmarklet.js
|
//= link bookmarklet.js
|
||||||
//= link mobile/bookmarklet.js
|
//= link mobile/bookmarklet.js
|
||||||
//= link mobile/mobile.js
|
//= link mobile/mobile.js
|
||||||
//= link templates.js
|
|
||||||
//= link error_pages.css
|
//= link error_pages.css
|
||||||
//= link admin.css
|
//= link admin.css
|
||||||
//= link rtl.css
|
//= link rtl.css
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,4 @@
|
||||||
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
|
// @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 */
|
Handlebars.registerPartial("status-message", HandlebarsTemplates["status-message_tpl"]);
|
||||||
$(function(){
|
|
||||||
Handlebars.registerPartial('status-message', HandlebarsTemplates['status-message_tpl']);
|
|
||||||
});
|
|
||||||
// @license-end
|
// @license-end
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
//= require jquery3
|
//= require jquery3
|
||||||
//= require handlebars.runtime
|
//= require handlebars.runtime
|
||||||
//= require templates
|
|
||||||
//= require main
|
//= require main
|
||||||
//= require fine-uploader/fine-uploader.core
|
//= require fine-uploader/fine-uploader.core
|
||||||
//= require mobile/mobile
|
//= require mobile/mobile
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@
|
||||||
//= require jquery.autoSuggest.custom
|
//= require jquery.autoSuggest.custom
|
||||||
//= require fine-uploader/fine-uploader.core
|
//= require fine-uploader/fine-uploader.core
|
||||||
//= require handlebars.runtime
|
//= require handlebars.runtime
|
||||||
|
//= require_tree ../templates
|
||||||
//= require posix-bracket-expressions
|
//= require posix-bracket-expressions
|
||||||
//= require markdown-it
|
//= require markdown-it
|
||||||
//= require markdown-it-diaspora-mention
|
//= require markdown-it-diaspora-mention
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
%meta{name: "viewport", content: "width=device-width, initial-scale=1"}/
|
%meta{name: "viewport", content: "width=device-width, initial-scale=1"}/
|
||||||
|
|
||||||
- content_for :javascript do
|
- content_for :javascript do
|
||||||
= javascript_include_tag :main, :templates
|
= javascript_include_tag :main
|
||||||
= load_javascript_locales
|
= load_javascript_locales
|
||||||
|
|
||||||
= include_color_theme
|
= include_color_theme
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue