From bea5df01047f118f634ae3c54ee479215ceed787 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 26 May 2015 11:13:13 -0400 Subject: [PATCH] UX: Show domains even on local links in the topic map with titles --- .../discourse/helpers/link-domain.js.es6 | 13 +++++++------ .../discourse/templates/components/topic-map.hbs | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/helpers/link-domain.js.es6 b/app/assets/javascripts/discourse/helpers/link-domain.js.es6 index ba59b7f50d1..c5c3d03eadf 100644 --- a/app/assets/javascripts/discourse/helpers/link-domain.js.es6 +++ b/app/assets/javascripts/discourse/helpers/link-domain.js.es6 @@ -2,12 +2,13 @@ import registerUnbound from 'discourse/helpers/register-unbound'; registerUnbound('link-domain', function(link) { if (link) { - var internal = Em.get(link, 'internal'), - hasTitle = (!Em.isEmpty(Em.get(link, 'title'))); - if (hasTitle && !internal) { - var domain = Em.get(link, 'domain'); - if (!Em.isEmpty(domain)) { - var s = domain.split('.'); + const hasTitle = (!Ember.isEmpty(Em.get(link, 'title'))); + + if (hasTitle) { + let domain = Ember.get(link, 'domain'); + console.log('domain', domain); + if (!Ember.isEmpty(domain)) { + const s = domain.split('.'); domain = s[s.length-2] + "." + s[s.length-1]; return new Handlebars.SafeString("" + domain + ""); } diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.hbs b/app/assets/javascripts/discourse/templates/components/topic-map.hbs index 7d710067913..1ab49363e76 100644 --- a/app/assets/javascripts/discourse/templates/components/topic-map.hbs +++ b/app/assets/javascripts/discourse/templates/components/topic-map.hbs @@ -66,7 +66,7 @@