github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-15 19:05:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Typo'd name of jump-bottom

Browse Source
This commit is contained in:
Robin Ward 2017-10-11 15:47:18 -04:00
parent d43fa4d584
commit c9b5ef9f58
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/raw-views/topic-status.js.es6
View File

@ -1,10 +1,11 @@
import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Object.extend({
showDefault: null,
@computed
renderDiv() {
return this.get('statuses').length > 0 && !this.noDiv;
@computed('defaultIcon')
renderDiv(defaultIcon) {
return (defaultIcon || this.get('statuses').length > 0) && !this.noDiv;
},
@computed
@ -61,6 +62,11 @@ export default Ember.Object.extend({
}
});
let defaultIcon = this.get('defaultIcon');
if (results.length === 0 && defaultIcon) {
this.set('showDefault', defaultIcon);
}
return results;
}
});

2
app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
View File

@ -2,6 +2,6 @@
{{d-icon 'caret-up'}} {{{topDate}}}
{{/d-button}}
{{#d-button action="enterBottom" class="full jump-button"}}
{{#d-button action="enterBottom" class="full jump-bottom"}}
{{{bottomDate}}} {{d-icon 'caret-down'}}
{{/d-button}}

1
app/assets/javascripts/discourse/templates/topic-status.raw.hbs
View File

@ -8,6 +8,7 @@
<{{status.openTag}} title='{{status.title}}' class='topic-status'>{{d-icon status.icon}}</{{status.closeTag}}>
{{~/if ~}}
{{~/each}}
{{~#if view.showDefault~}}{{d-icon view.showDefault}}{{~/if ~}}
{{~#if view.renderDiv ~}}
</div>
{{/if ~}}