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

UX: Close user card right away when navigating to a user.

Browse Source
This commit is contained in:
Robin Ward 2015-06-01 12:40:53 -04:00
parent b2a7411620
commit 72f7c26514
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/controllers/user-card.js.es6
View File

@ -103,6 +103,11 @@ export default Ember.Controller.extend({
postStream.cancelFilter();
postStream.refresh();
this.close();
},
showUser() {
this.transitionToRoute('user', this.get('user'));
this.close();
}
}

15
app/assets/javascripts/discourse/templates/user-card.hbs
View File

@ -1,11 +1,12 @@
{{#if controller.visible}}
<div class="card-content">
{{#link-to 'user' user}}{{bound-avatar avatar "huge"}}{{/link-to}}
<a href {{action "showUser"}}>{{bound-avatar avatar "huge"}}</a>
<div class="names">
<span>
<h1 {{bind-attr class="staff new_user"}}>
{{#link-to 'user' user}}{{username}} {{user-status user currentUser=currentUser}}{{/link-to}}
<h1 class="{{staff}} {{new_user}}">
<a href {{action "showUser"}}>{{username}} {{user-status user currentUser=currentUser}}</a>
</h1>
{{#if user.name}}
@ -17,7 +18,7 @@
{{/if}}
{{#if showName}}
<h2>{{#link-to 'user' user}}{{name}}{{/link-to}}</h2>
<h2><a href {{Action "showUser"}}>{{name}}</a></h2>
{{/if}}
</span>
</div>
@ -28,15 +29,15 @@
{{/if}}
{{#if showFilter}}
<li><a class='btn' {{action "togglePosts" user}}>{{fa-icon "filter"}}{{i18n 'topic.filter_to' username=username post_count=topicPostCount}}</a></li>
<li><a class='btn' href {{action "togglePosts" user}}>{{fa-icon "filter"}}{{i18n 'topic.filter_to' username=username post_count=topicPostCount}}</a></li>
{{/if}}
{{#if hasUserFilters}}
<li><a class='btn' {{action "cancelFilter"}}>{{fa-icon "times"}}{{i18n 'topic.filters.cancel'}}</a></li>
<li><a class='btn' href {{action "cancelFilter"}}>{{fa-icon "times"}}{{i18n 'topic.filters.cancel'}}</a></li>
{{/if}}
{{#if showDelete}}
<li><a class='btn btn-danger' {{action "deleteUser" user}}>{{fa-icon "exclamation-triangle"}}{{i18n 'admin.user.delete'}}</a></li>
<li><a class='btn btn-danger' href {{action "deleteUser" user}}>{{fa-icon "exclamation-triangle"}}{{i18n 'admin.user.delete'}}</a></li>
{{/if}}
</ul>

3
app/assets/javascripts/discourse/views/user-card.js.es6
View File

@ -127,8 +127,7 @@ export default Discourse.View.extend(CleansUp, {
_removeEvents: function() {
$('html').off(clickOutsideEventName);
$('#main').off(clickDataExpand)
.off(clickMention);
$('#main').off(clickDataExpand).off(clickMention);
this.appEvents.off('usercard:shown', this, '_shown');
}.on('willDestroyElement')