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

Remove the open_topic_featured_link_in_external_window setting. Use the user preference.

Browse Source
This commit is contained in:
Neil Lalonde 2016-12-09 13:48:29 -05:00
parent a4c4f13901
commit a62b028e16
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
View File

@ -8,7 +8,9 @@ export function addFeaturedLinkMetaDecorator(decorator) {
} }
function extractLinkMeta(topic) { function extractLinkMeta(topic) {
const href = topic.featured_link, target = Discourse.SiteSettings.open_topic_featured_link_in_external_window ? '_blank' : ''; const href = topic.featured_link,
target = Discourse.User.currentProp('external_links_in_new_tab') ? '_blank' : '';
if (!href) { return; } if (!href) { return; }
let domain = extractDomainFromUrl(href); let domain = extractDomainFromUrl(href);

2
config/locales/server.en.yml
View File

@ -851,8 +851,6 @@ en:
min_private_message_post_length: "Minimum allowed post length in characters for messages" min_private_message_post_length: "Minimum allowed post length in characters for messages"
max_post_length: "Maximum allowed post length in characters" max_post_length: "Maximum allowed post length in characters"
topic_featured_link_enabled: "Enable posting a link with topics." topic_featured_link_enabled: "Enable posting a link with topics."
topic_featured_link_onebox: "Show an onebox in the post body if possible and prevent editing post content."
open_topic_featured_link_in_external_window: "Open topic featured link in a external window."
show_topic_featured_link_in_digest: "Show the topic featured link in the digest email." show_topic_featured_link_in_digest: "Show the topic featured link in the digest email."
min_topic_title_length: "Minimum allowed topic title length in characters" min_topic_title_length: "Minimum allowed topic title length in characters"
max_topic_title_length: "Maximum allowed topic title length in characters" max_topic_title_length: "Maximum allowed topic title length in characters"

3
config/site_settings.yml
View File

@ -436,9 +436,6 @@ posting:
topic_featured_link_enabled: topic_featured_link_enabled:
client: true client: true
default: false default: false
open_topic_featured_link_in_external_window:
client: true
default: true
body_min_entropy: 7 body_min_entropy: 7
min_topic_title_length: min_topic_title_length:
client: true client: true