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

Broken tests, let's try popping in/out now to see how that works.

Browse Source
This commit is contained in:
Robin Ward 2014-11-04 13:46:35 -05:00
parent d4d282e919
commit 9161b8529f
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, {
selectedPosts: null, selectedPosts: null,
selectedReplies: null, selectedReplies: null,
queryParams: ['filter', 'username_filters', 'show_deleted'], queryParams: ['filter', 'username_filters', 'show_deleted'],
searchHighlight: null,
maxTitleLength: Discourse.computed.setting('max_topic_title_length'), maxTitleLength: Discourse.computed.setting('max_topic_title_length'),

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

@ -47,7 +47,6 @@ export default ObjectController.extend({
} else { } else {
this.set('avatar', null); this.set('avatar', null);
} }
this.set('username', username); this.set('username', username);
// If we click the avatar again, close it. // If we click the avatar again, close it.

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

@ -6,22 +6,9 @@ var clickOutsideEventName = "mousedown.outside-user-card",
export default Discourse.View.extend(CleansUp, { export default Discourse.View.extend(CleansUp, {
elementId: 'user-card', elementId: 'user-card',
classNameBindings: ['controller.showBadges'], classNameBindings: ['controller.visible::hidden', 'controller.showBadges'],
allowBackgrounds: Discourse.computed.setting('allow_profile_backgrounds'), allowBackgrounds: Discourse.computed.setting('allow_profile_backgrounds'),
_visibleChanged: function() {
var vis = this.get('controller.visible'),
$this = this.$();
if (!$this) { return; }
if (vis) {
this.$().fadeIn('fast');
} else {
this.$().fadeOut('fast');
}
}.observes('controller.visible'),
addBackground: function() { addBackground: function() {
var url = this.get('controller.user.card_background'); var url = this.get('controller.user.card_background');
if (!this.get('allowBackgrounds')) { return; } if (!this.get('allowBackgrounds')) { return; }