Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PERF: move excerpt to raw, expose i18n to handlebars

This commit is contained in:
Sam 2014-10-29 16:08:35 +11:00
parent 403271d2db
commit eab12cc6b8
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/helpers/i18n_helpers.js
View File

@ -23,7 +23,7 @@ I18n.toHumanSize = function(number, options) {
@method i18n @method i18n
@for Handlebars @for Handlebars
**/ **/
Ember.Handlebars.registerHelper('i18n', function(property, options) { Handlebars.registerHelper('i18n', function(property, options) {
// Resolve any properties // Resolve any properties
var params = options.hash, var params = options.hash,
self = this; self = this;

6
app/assets/javascripts/discourse/lib/ember_compat_handlebars.js
View File

@ -60,11 +60,7 @@
var id = new Handlebars.AST.IdNode([{ part: 'get' }]); var id = new Handlebars.AST.IdNode([{ part: 'get' }]);
if (!mustache.escaped) { mustache = new Handlebars.AST.MustacheNode([id].concat([mustache.id]), mustache.hash, mustache.escaped);
mustache.hash = mustache.hash || new Handlebars.AST.HashNode([]);
mustache.hash.pairs.push(["unescaped", new Handlebars.AST.StringNode("true")]);
}
mustache = new Handlebars.AST.MustacheNode([id].concat([mustache.id]), mustache.hash, !mustache.escaped);
} }
return Handlebars.Compiler.prototype.mustache.call(this, mustache); return Handlebars.Compiler.prototype.mustache.call(this, mustache);

8
app/assets/javascripts/discourse/templates/list/topic_excerpt.raw.hbs Normal file
View File

@ -0,0 +1,8 @@
{{#if topic.hasExcerpt}}
<div class="topic-excerpt">
{{{topic.excerpt}}}
{{#if topic.excerptTruncated}}
<a href="{{topic.url}}">{{i18n read_more}}</a>
{{/if}}
</div>
{{/if}}

11
app/assets/javascripts/discourse/templates/list/topic_list_item.hbs
View File

@ -10,21 +10,14 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<td class='main-link clearfix' {{bind-attr colspan="titleColSpan"}}> <td class='main-link clearfix' colspan="{{unbound titleColSpan}}">
{{topic-status topic=this.model}} {{topic-status topic=this.model}}
{{topic-link this}} {{topic-link this}}
{{#if showTopicPostBadges}} {{#if showTopicPostBadges}}
{{topic-post-badges unread=unread newPosts=displayNewPosts unseen=unseen url=lastUnreadUrl}} {{topic-post-badges unread=unread newPosts=displayNewPosts unseen=unseen url=lastUnreadUrl}}
{{/if}} {{/if}}
{{#if hasExcerpt}} {{raw "list/topic_excerpt" topic=model}}
<div class="topic-excerpt">
{{{excerpt}}}
{{#if excerptTruncated}}
<a href="{{url}}">{{i18n read_more}}</a>
{{/if}}
</div>
{{/if}}
</td> </td>
{{raw "list/category_column" hideCategory=hideCategory category=category}} {{raw "list/category_column" hideCategory=hideCategory category=category}}