IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Back button mobile from user activity stream

Browse Source
This commit is contained in:
Robin Ward 2015-05-25 13:40:46 -04:00
parent ee129edf25
commit 3437513025
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/routes/user-index.js.es6
View File

@ -1,7 +1,14 @@
export default Discourse.Route.extend({ export default Discourse.Route.extend({
beforeModel: function() { beforeModel: function() {
this.transitionTo('userActivity'); // HACK: Something with the way the user card intercepts clicks seems to break how the
// transition into a user's activity works. This makes the back button work on mobile
// where there is no user card as well as desktop where there is.
if (Discourse.Mobile.mobileView) {
this.replaceWith('userActivity');
} else {
this.transitionTo('userActivity');
}
} }
}); });

6
app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
View File

@ -16,13 +16,13 @@
{{topic-list {{topic-list
showPosters=true showPosters=true
currentUser=currentUser currentUser=currentUser
hideCategory=hideCategory hideCategory=model.hideCategory
topics=topics}} topics=model.topics}}
{{/if}} {{/if}}
</div> </div>
<footer class='topic-list-bottom'> <footer class='topic-list-bottom'>
{{conditional-loading-spinner condition=loadingMore}} {{conditional-loading-spinner condition=model.loadingMore}}
{{#if allLoaded}} {{#if allLoaded}}
{{#if showDismissRead}} {{#if showDismissRead}}
<button title="{{i18n 'topics.bulk.dismiss_topics_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n 'topics.bulk.dismiss_topics'}}</button> <button title="{{i18n 'topics.bulk.dismiss_topics_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n 'topics.bulk.dismiss_topics'}}</button>