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

More 1.9.0 fixes

This commit is contained in:
Robin Ward 2014-12-10 17:19:46 -05:00
parent 02f3a2d115
commit 008a19f997
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
View File

@ -89,10 +89,8 @@ export default function(connectionName, options) {
var self = this; var self = this;
if (_connectorCache[connectionName]) { if (_connectorCache[connectionName]) {
var view, var view;
childViews = _connectorCache[connectionName].map(function(vc) { var childViews = _connectorCache[connectionName];
return vc.create({ context: self });
});
// If there is more than one view, create a container. Otherwise // If there is more than one view, create a container. Otherwise
// just shove it in. // just shove it in.

18
app/assets/javascripts/discourse/templates/components/topic-map.hbs
View File

@ -46,8 +46,8 @@
{{/if}} {{/if}}
{{#if showPosterAvatar}} {{#if showPosterAvatar}}
<li {{bind-attr class=":avatars mapCollapsed::hidden"}}> <li {{bind-attr class=":avatars mapCollapsed::hidden"}}>
{{#each details.fewParticipants}} {{#each p in details.fewParticipants}}
{{topic-participant participant=this}} {{topic-participant participant=p}}
{{/each}} {{/each}}
</li> </li>
{{/if}} {{/if}}
@ -56,8 +56,8 @@
{{#unless mapCollapsed}} {{#unless mapCollapsed}}
<section class='avatars clearfix'> <section class='avatars clearfix'>
{{#each details.participants}} {{#each p in details.participants}}
{{topic-participant participant=this}} {{topic-participant participant=p}}
{{/each}} {{/each}}
</section> </section>
@ -65,16 +65,16 @@
<section class='links'> <section class='links'>
<table class='topic-links'> <table class='topic-links'>
{{#each infoLinks}} {{#each link in infoLinks}}
<tr> <tr>
<td> <td>
<span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=clicks}}'>{{clicks}}</span> <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=clicks}}'>{{link.clicks}}</span>
</td> </td>
<td> <td>
<a href="{{unbound url}}" target="_blank" class='topic-link track-link' data-user-id="{{unbound user_id}}" data-ignore-post-id="true" title="{{unbound url}}"> <a href="{{unbound link.url}}" target="_blank" class='topic-link track-link' data-user-id="{{unbound link.user_id}}" data-ignore-post-id="true" title="{{unbound link.url}}">
{{#if title}}{{title}}{{else}}{{shorten-url url}}{{/if}} {{#if link.title}}{{link.title}}{{else}}{{shorten-url link.url}}{{/if}}
</a> </a>
{{link-domain this}} {{link-domain link}}
</td> </td>
</tr> </tr>
{{/each}} {{/each}}