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

UX: Focus on the user card when it's rendered

Browse Source
This commit is contained in:
Robin Ward 2014-11-10 11:31:28 -05:00
parent bfa5835025
commit 9f127d8183
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@ export default ObjectController.extend({
Discourse.User.findByUsername(username).then(function (user) { Discourse.User.findByUsername(username).then(function (user) {
self.setProperties({ user: user, avatar: user, visible: true}); self.setProperties({ user: user, avatar: user, visible: true});
self.appEvents.trigger('usercard:shown');
}).finally(function(){ }).finally(function(){
self.set('userLoading', null); self.set('userLoading', null);
}); });

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

@ -25,7 +25,6 @@ export default Discourse.View.extend(CleansUp, {
_setup: function() { _setup: function() {
var self = this; var self = this;
this.appEvents.on('poster:expand', this, '_posterExpand');
$('html').off(clickOutsideEventName).on(clickOutsideEventName, function(e) { $('html').off(clickOutsideEventName).on(clickOutsideEventName, function(e) {
if (self.get('controller.visible')) { if (self.get('controller.visible')) {
@ -43,7 +42,7 @@ export default Discourse.View.extend(CleansUp, {
}); });
var expand = function(username, $target){ var expand = function(username, $target){
self._posterExpand($target); self._willShow($target);
self.get('controller').show(username, $target[0]); self.get('controller').show(username, $target[0]);
return false; return false;
}; };
@ -59,9 +58,19 @@ export default Discourse.View.extend(CleansUp, {
var username = $target.text().replace(/^@/, ''); var username = $target.text().replace(/^@/, '');
return expand(username, $target); return expand(username, $target);
}); });
this.appEvents.on('usercard:shown', this, '_shown');
}.on('didInsertElement'), }.on('didInsertElement'),
_posterExpand: function(target) { _shown: function() {
var self = this;
// After the card is shown, focus on the first link
Ember.run.scheduleOnce('afterRender', function() {
self.$('a:first').focus();
});
},
_willShow: function(target) {
if (!target) { return; } if (!target) { return; }
var self = this, var self = this,
width = this.$().width(); width = this.$().width();
@ -93,7 +102,7 @@ export default Discourse.View.extend(CleansUp, {
$('#main').off(clickDataExpand); $('#main').off(clickDataExpand);
$('#main').off(clickMention); $('#main').off(clickMention);
this.appEvents.off('poster:expand', this, '_posterExpand'); this.appEvents.off('usercard:shown', this, '_shown');
}.on('willDestroyElement') }.on('willDestroyElement')
}); });