Unverified Commit f632f8a1 authored Mar 16, 2018 by cmrd Senya Committed by Benjamin Neff Mar 25, 2018

Include templates to main.js

This is needed to properly initialize Handlebars partials without
a document ready handler.

fixes #7739

closes #7740

parent bc3908a1

Changelog.md

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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

app/assets/config/manifest.js

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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

app/assets/javascripts/app/helpers/handlebars-partials.js

+1 −4

Original line number	Original line	Diff line number	Diff line
	// @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

app/assets/javascripts/jasmine-load-all.js

+0 −1

Original line number	Original line	Diff line number	Diff line
	//= 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

app/assets/javascripts/main.js

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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