github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 04:13:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't show placeholders on Android

Browse Source
This commit is contained in:
Robin Ward 2015-12-04 17:19:54 -05:00
parent aa54006ad5
commit d97b2382e6
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/controllers/topic.js.es6
View File

@ -34,6 +34,17 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
}
}.observes('model.title', 'category'),
@computed('model.postStream.posts')
postsToRender() {
return this.capabilities.isAndroid ? this.get('model.postStream.posts')
: this.get('model.postStream.postsWithPlaceholders');
},
@computed('model.postStream.loadingFilter')
androidLoading(loading) {
return this.capabilities.isAndroid && loading;
},
@computed('model.postStream.summary')
show_deleted: {
set(value) {

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

@ -69,7 +69,7 @@
{{#unless model.postStream.loadingFilter}}
{{cloaked-collection itemViewClass="post"
defaultHeight="200"
content=model.postStream.postsWithPlaceholders
content=postsToRender
slackRatio="15"
loadingHTML=""
preservesContext="true"