paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

templates: Suppress Handlebars automatic partial indentation.

Browse Source 
Fixes #12795.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2019-07-16 14:20:23 -07:00
committed by Tim Abbott
parent 07f93d58a3
commit b1aa304c4a
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/templates.js
View File

@@ -870,7 +870,7 @@ run_test('message_group', () => {
{ {
msg: { msg: {
content: 'This is message two.', content: 'This is message two.',
match_content: 'This is message <span class="highlight">two</span>.', match_content: 'This is message <span class="highlight">two</span>.\n<pre>code\nblock</pre>',
is_stream: true, is_stream: true,
unread: true, unread: true,
id: 2, id: 2,
@@ -897,7 +897,7 @@ run_test('message_group', () => {
assert.equal(first_message_text, "This is message one."); assert.equal(first_message_text, "This is message one.");
var last_message_html = $(html).next('.recipient_row').find('div.messagebox').last().find('.message_content').html().trim(); var last_message_html = $(html).next('.recipient_row').find('div.messagebox').last().find('.message_content').html().trim();
assert.equal(last_message_html, 'This is message <span class="highlight">two</span>.'); assert.equal(last_message_html, 'This is message <span class="highlight">two</span>.\n<pre>code\nblock</pre>');
var highlighted_topic_word = $(html).find('a.narrows_by_topic .highlight').text(); var highlighted_topic_word = $(html).find('a.narrows_by_topic .highlight').text();
assert.equal(highlighted_topic_word, 'two'); assert.equal(highlighted_topic_word, 'two');

5
frontend_tests/zjsunit/handlebars.js
View File

@@ -14,7 +14,10 @@ module.exports.make_handlebars = () => {
const name = "$" + path.relative(templates_path, filename); const name = "$" + path.relative(templates_path, filename);
if (!compiled.has(name)) { if (!compiled.has(name)) {
compiled.add(name); compiled.add(name);
hb.registerPartial(name, hb.compile(fs.readFileSync(filename, "utf-8"), { zjsFilename: filename })); hb.registerPartial(
name,
hb.compile(fs.readFileSync(filename, "utf-8"), { preventIndent: true, zjsFilename: filename })
);
} }
return name; return name;
}; };

1
tools/webpack.config.ts
View File

@@ -87,6 +87,7 @@ export default (env?: string): webpack.Configuration[] => {
// The ones below are defined in static/js/templates.js // The ones below are defined in static/js/templates.js
'partial', 'plural', 'eq', 'and', 'or', 'not', 'partial', 'plural', 'eq', 'and', 'or', 'not',
't', 'tr'], 't', 'tr'],
preventIndent: true,
}, },
}, },
// load fonts and files // load fonts and files