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

Additioning Linting fixes

Browse Source
This commit is contained in:
Robin Ward
2019-10-23 12:41:58 -04:00
parent dd3ace5c77
commit 0b37a3c235
2 changed files with 213 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
View File

@@ -3,54 +3,50 @@ import { on, observes } from "ember-addons/ember-computed-decorators";
import LoadMore from "discourse/mixins/load-more";
import UrlRefresh from "discourse/mixins/url-refresh";
const DiscoveryTopicsListComponent = Component.extend(
UrlRefresh,
LoadMore,
{
classNames: ["contents"],
eyelineSelector: ".topic-list-item",
const DiscoveryTopicsListComponent = Component.extend(UrlRefresh, LoadMore, {
classNames: ["contents"],
eyelineSelector: ".topic-list-item",
@on("didInsertElement")
@observes("model")
_readjustScrollPosition() {
const scrollTo = this.session.get("topicListScrollPosition");
if (scrollTo && scrollTo >= 0) {
Ember.run.schedule("afterRender", () =>
$(window).scrollTop(scrollTo + 1)
);
} else {
Ember.run.scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
}
},
@on("didInsertElement")
@observes("model")
_readjustScrollPosition() {
const scrollTo = this.session.get("topicListScrollPosition");
if (scrollTo && scrollTo >= 0) {
Ember.run.schedule("afterRender", () =>
$(window).scrollTop(scrollTo + 1)
);
} else {
Ember.run.scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
}
},
@observes("topicTrackingState.states")
_updateTopics() {
this.topicTrackingState.updateTopics(this.model.topics);
},
@observes("topicTrackingState.states")
_updateTopics() {
this.topicTrackingState.updateTopics(this.model.topics);
},
@observes("incomingCount")
_updateTitle() {
Discourse.updateContextCount(this.incomingCount);
},
@observes("incomingCount")
_updateTitle() {
Discourse.updateContextCount(this.incomingCount);
},
saveScrollPosition() {
this.session.set("topicListScrollPosition", $(window).scrollTop());
},
saveScrollPosition() {
this.session.set("topicListScrollPosition", $(window).scrollTop());
},
actions: {
loadMore() {
Discourse.updateContextCount(0);
this.model.loadMore().then(hasMoreResults => {
Ember.run.schedule("afterRender", () => this.saveScrollPosition());
if (!hasMoreResults) {
this.eyeline.flushRest();
} else if ($(window).height() >= $(document).height()) {
this.send("loadMore");
}
});
}
actions: {
loadMore() {
Discourse.updateContextCount(0);
this.model.loadMore().then(hasMoreResults => {
Ember.run.schedule("afterRender", () => this.saveScrollPosition());
if (!hasMoreResults) {
this.eyeline.flushRest();
} else if ($(window).height() >= $(document).height()) {
this.send("loadMore");
}
});
}
}
);
});
export default DiscoveryTopicsListComponent;

360
app/assets/javascripts/discourse/components/user-card-contents.js.es6
View File

@@ -11,213 +11,203 @@ import CardContentsBase from "discourse/mixins/card-contents-base";
import CleansUp from "discourse/mixins/cleans-up";
import { prioritizeNameInUx } from "discourse/lib/settings";
export default Component.extend(
CardContentsBase,
CanCheckEmails,
CleansUp,
{
elementId: "user-card",
triggeringLinkClass: "mention",
classNameBindings: [
"visible:show",
"showBadges",
"user.card_background::no-bg",
"isFixed:fixed",
"usernameClass"
],
allowBackgrounds: setting("allow_profile_backgrounds"),
showBadges: setting("enable_badges"),
export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
elementId: "user-card",
triggeringLinkClass: "mention",
classNameBindings: [
"visible:show",
"showBadges",
"user.card_background::no-bg",
"isFixed:fixed",
"usernameClass"
],
allowBackgrounds: setting("allow_profile_backgrounds"),
showBadges: setting("enable_badges"),
postStream: Ember.computed.alias("topic.postStream"),
enoughPostsForFiltering: Ember.computed.gte("topicPostCount", 2),
showFilter: Ember.computed.and(
"viewingTopic",
"postStream.hasNoFilters",
"enoughPostsForFiltering"
),
showName: propertyNotEqual("user.name", "user.username"),
hasUserFilters: Ember.computed.gt("postStream.userFilters.length", 0),
showMoreBadges: Ember.computed.gt("moreBadgesCount", 0),
showDelete: Ember.computed.and(
"viewingAdmin",
"showName",
"user.canBeDeleted"
),
linkWebsite: Ember.computed.not("user.isBasic"),
hasLocationOrWebsite: Ember.computed.or(
"user.location",
"user.website_name"
),
isSuspendedOrHasBio: Ember.computed.or(
"user.suspend_reason",
"user.bio_cooked"
),
showCheckEmail: Ember.computed.and("user.staged", "canCheckEmails"),
postStream: Ember.computed.alias("topic.postStream"),
enoughPostsForFiltering: Ember.computed.gte("topicPostCount", 2),
showFilter: Ember.computed.and(
"viewingTopic",
"postStream.hasNoFilters",
"enoughPostsForFiltering"
),
showName: propertyNotEqual("user.name", "user.username"),
hasUserFilters: Ember.computed.gt("postStream.userFilters.length", 0),
showMoreBadges: Ember.computed.gt("moreBadgesCount", 0),
showDelete: Ember.computed.and(
"viewingAdmin",
"showName",
"user.canBeDeleted"
),
linkWebsite: Ember.computed.not("user.isBasic"),
hasLocationOrWebsite: Ember.computed.or("user.location", "user.website_name"),
isSuspendedOrHasBio: Ember.computed.or(
"user.suspend_reason",
"user.bio_cooked"
),
showCheckEmail: Ember.computed.and("user.staged", "canCheckEmails"),
user: null,
user: null,
// If inside a topic
topicPostCount: null,
// If inside a topic
topicPostCount: null,
@computed("user.staff")
staff: isStaff => (isStaff ? "staff" : ""),
@computed("user.staff")
staff: isStaff => (isStaff ? "staff" : ""),
@computed("user.trust_level")
newUser: trustLevel => (trustLevel === 0 ? "new-user" : ""),
@computed("user.trust_level")
newUser: trustLevel => (trustLevel === 0 ? "new-user" : ""),
@computed("user.name")
nameFirst(name) {
return prioritizeNameInUx(name, this.siteSettings);
},
@computed("user.name")
nameFirst(name) {
return prioritizeNameInUx(name, this.siteSettings);
},
@computed("username")
usernameClass: username => (username ? `user-card-${username}` : ""),
@computed("username")
usernameClass: username => (username ? `user-card-${username}` : ""),
@computed("username", "topicPostCount")
togglePostsLabel(username, count) {
return I18n.t("topic.filter_to", { username, count });
},
@computed("username", "topicPostCount")
togglePostsLabel(username, count) {
return I18n.t("topic.filter_to", { username, count });
},
@computed("user.user_fields.@each.value")
publicUserFields() {
const siteUserFields = this.site.get("user_fields");
if (!Ember.isEmpty(siteUserFields)) {
const userFields = this.get("user.user_fields");
return siteUserFields
.filterBy("show_on_user_card", true)
.sortBy("position")
.map(field => {
Ember.set(field, "dasherized_name", field.get("name").dasherize());
const value = userFields ? userFields[field.get("id")] : null;
return Ember.isEmpty(value)
? null
: Ember.Object.create({ value, field });
})
.compact();
}
},
@computed("user.trust_level")
removeNoFollow(trustLevel) {
return trustLevel > 2 && !this.siteSettings.tl3_links_no_follow;
},
@computed("user.badge_count", "user.featured_user_badges.length")
moreBadgesCount: (badgeCount, badgeLength) => badgeCount - badgeLength,
@computed("user.time_read", "user.recent_time_read")
showRecentTimeRead(timeRead, recentTimeRead) {
return timeRead !== recentTimeRead && recentTimeRead !== 0;
},
@computed("user.recent_time_read")
recentTimeRead(recentTimeReadSeconds) {
return durationTiny(recentTimeReadSeconds);
},
@computed("showRecentTimeRead", "user.time_read", "recentTimeRead")
timeReadTooltip(showRecent, timeRead, recentTimeRead) {
if (showRecent) {
return I18n.t("time_read_recently_tooltip", {
time_read: durationTiny(timeRead),
recent_time_read: recentTimeRead
});
} else {
return I18n.t("time_read_tooltip", {
time_read: durationTiny(timeRead)
});
}
},
@observes("user.card_background_upload_url")
addBackground() {
if (!this.allowBackgrounds) {
return;
}
const thisElem = this.element;
if (!thisElem) {
return;
}
const url = this.get("user.card_background_upload_url");
const bg = Ember.isEmpty(url)
? ""
: `url(${Discourse.getURLWithCDN(url)})`;
thisElem.style.backgroundImage = bg;
},
_showCallback(username, $target) {
this._positionCard($target);
this.setProperties({ visible: true, loading: true });
const args = { stats: false };
args.include_post_count_for = this.get("topic.id");
User.findByUsername(username, args)
.then(user => {
if (user.topic_post_count) {
this.set(
"topicPostCount",
user.topic_post_count[args.include_post_count_for]
);
}
this.setProperties({ user });
@computed("user.user_fields.@each.value")
publicUserFields() {
const siteUserFields = this.site.get("user_fields");
if (!Ember.isEmpty(siteUserFields)) {
const userFields = this.get("user.user_fields");
return siteUserFields
.filterBy("show_on_user_card", true)
.sortBy("position")
.map(field => {
Ember.set(field, "dasherized_name", field.get("name").dasherize());
const value = userFields ? userFields[field.get("id")] : null;
return Ember.isEmpty(value)
? null
: Ember.Object.create({ value, field });
})
.catch(() => this._close())
.finally(() => this.set("loading", null));
},
.compact();
}
},
_close() {
this._super(...arguments);
@computed("user.trust_level")
removeNoFollow(trustLevel) {
return trustLevel > 2 && !this.siteSettings.tl3_links_no_follow;
},
this.setProperties({
user: null,
topicPostCount: null
@computed("user.badge_count", "user.featured_user_badges.length")
moreBadgesCount: (badgeCount, badgeLength) => badgeCount - badgeLength,
@computed("user.time_read", "user.recent_time_read")
showRecentTimeRead(timeRead, recentTimeRead) {
return timeRead !== recentTimeRead && recentTimeRead !== 0;
},
@computed("user.recent_time_read")
recentTimeRead(recentTimeReadSeconds) {
return durationTiny(recentTimeReadSeconds);
},
@computed("showRecentTimeRead", "user.time_read", "recentTimeRead")
timeReadTooltip(showRecent, timeRead, recentTimeRead) {
if (showRecent) {
return I18n.t("time_read_recently_tooltip", {
time_read: durationTiny(timeRead),
recent_time_read: recentTimeRead
});
},
} else {
return I18n.t("time_read_tooltip", {
time_read: durationTiny(timeRead)
});
}
},
cleanUp() {
@observes("user.card_background_upload_url")
addBackground() {
if (!this.allowBackgrounds) {
return;
}
const thisElem = this.element;
if (!thisElem) {
return;
}
const url = this.get("user.card_background_upload_url");
const bg = Ember.isEmpty(url) ? "" : `url(${Discourse.getURLWithCDN(url)})`;
thisElem.style.backgroundImage = bg;
},
_showCallback(username, $target) {
this._positionCard($target);
this.setProperties({ visible: true, loading: true });
const args = { stats: false };
args.include_post_count_for = this.get("topic.id");
User.findByUsername(username, args)
.then(user => {
if (user.topic_post_count) {
this.set(
"topicPostCount",
user.topic_post_count[args.include_post_count_for]
);
}
this.setProperties({ user });
})
.catch(() => this._close())
.finally(() => this.set("loading", null));
},
_close() {
this._super(...arguments);
this.setProperties({
user: null,
topicPostCount: null
});
},
cleanUp() {
this._close();
},
actions: {
close() {
this._close();
},
actions: {
close() {
this._close();
},
composePM(user, post) {
this._close();
composePM(user, post) {
this._close();
Ember.getOwner(this)
.lookup("router:main")
.send("composePrivateMessage", user, post);
},
Ember.getOwner(this)
.lookup("router:main")
.send("composePrivateMessage", user, post);
},
cancelFilter() {
const postStream = this.postStream;
postStream.cancelFilter();
postStream.refresh();
this._close();
},
cancelFilter() {
const postStream = this.postStream;
postStream.cancelFilter();
postStream.refresh();
this._close();
},
togglePosts() {
this.togglePosts(this.user);
this._close();
},
togglePosts() {
this.togglePosts(this.user);
this._close();
},
deleteUser() {
this.user.delete();
this._close();
},
deleteUser() {
this.user.delete();
this._close();
},
showUser(username) {
this.showUser(username);
this._close();
},
showUser(username) {
this.showUser(username);
this._close();
},
checkEmail(user) {
user.checkEmail();
}
checkEmail(user) {
user.checkEmail();
}
}
);
});