Remove support for disable_jump_reply user setting (#7359)

This commit is contained in:
David Taylor
2019-04-12 00:03:07 +01:00
committed by Sam
parent dc703adad7
commit 24ef4f7b2b
17 changed files with 16 additions and 44 deletions
@@ -261,10 +261,8 @@ export default MountWidget.extend({
},
_posted(staged) {
const disableJumpReply = this.currentUser.get("disable_jump_reply");
this.queueRerender(() => {
if (staged && !disableJumpReply) {
if (staged) {
const postNumber = staged.get("post_number");
DiscourseURL.jumpToPost(postNumber, { skipIfOnScreen: true });
}
@@ -719,14 +719,9 @@ export default Ember.Controller.extend({
currentUser.set("reply_count", currentUser.get("reply_count") + 1);
}
const disableJumpReply = Discourse.User.currentProp(
"disable_jump_reply"
);
if (!composer.get("replyingToTopic") || !disableJumpReply) {
const post = result.target;
if (post && !staged) {
DiscourseURL.routeTo(post.get("url"));
}
const post = result.target;
if (post && !staged) {
DiscourseURL.routeTo(post.get("url"));
}
})
.catch(error => {
@@ -31,7 +31,6 @@ export default Ember.Controller.extend(PreferencesTabController, {
"external_links_in_new_tab",
"dynamic_favicon",
"enable_quoting",
"disable_jump_reply",
"automatically_unpin_topics",
"allow_private_messages",
"homepage_id",
@@ -274,7 +274,6 @@ const User = RestModel.extend({
"email_previous_replies",
"dynamic_favicon",
"enable_quoting",
"disable_jump_reply",
"automatically_unpin_topics",
"digest_after_minutes",
"new_topic_duration_minutes",
@@ -50,7 +50,6 @@
{{preference-checkbox labelKey="user.external_links_in_new_tab" checked=model.user_option.external_links_in_new_tab}}
{{preference-checkbox labelKey="user.enable_quoting" checked=model.user_option.enable_quoting}}
{{preference-checkbox labelKey="user.dynamic_favicon" checked=model.user_option.dynamic_favicon}}
{{preference-checkbox labelKey="user.disable_jump_reply" checked=model.user_option.disable_jump_reply}}
{{#if siteSettings.automatically_unpin_topics}}
{{preference-checkbox labelKey="user.automatically_unpin_topics" checked=model.user_option.automatically_unpin_topics}}
{{/if}}