Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit c9b1c6d

Browse files
authored
Merge pull request #1803 from reedrosenbluth/cosmeticLinkName
display shortened website url
2 parents dc5085b + 37f98fc commit c9b1c6d

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

js/templates/userPage.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
313313
</a>
314314
<%}%>
315315
<% if(ob.page.profile.website) { %>
316-
<a href="<%= ob.page.profile.website %>" class="js-externalLink"><%= ob.page.profile.website %></a> <span class="ion-android-open fontSize10"></span>
316+
<a href="<%= ob.page.profile.website %>" class="js-externalLink"><%= ob.short_website %></a> <span class="ion-android-open fontSize10"></span>
317317
<%}else{%>
318318
<%= polyglot.t('NotProvided') %>
319319
<%}%>

js/views/userPageVw.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,16 @@ UserPageVw = pageVw.extend({
303303
model.set('headerURL', self.options.userModel.get('serverUrl') + "get_image?hash=" + model.get('profile').header_hash + "&guid=" + self.pageID);
304304
model.set('avatarURL', self.options.userModel.get('serverUrl') + "get_image?hash=" + model.get('profile').avatar_hash + "&guid=" + self.pageID);
305305
}
306+
306307
// Cache user avatar in localStorage
307308
var profile = model.toJSON().profile;
308309
window.localStorage.setItem("avatar_" + self.pageID, profile.avatar_hash);
309310

311+
if (response.profile.website) {
312+
var website = profile.website;
313+
self.short_website = self.trimUrl(website);
314+
}
315+
310316
self.model.set({user: self.options.userModel.toJSON(), page: model.toJSON()});
311317
self.model.set({ownPage: self.options.ownPage});
312318
self.render();
@@ -317,6 +323,7 @@ UserPageVw = pageVw.extend({
317323
window.obEventBus.trigger('handleObtained', profile);
318324
app.appBar.setTitle(profile.handle);
319325
}
326+
320327
} else {
321328
//model was returned as a blank object
322329
self.loadingDeferred.reject();
@@ -377,7 +384,8 @@ UserPageVw = pageVw.extend({
377384
self.setCustomStyles();
378385
self.$el.html(loadedTemplate(
379386
__.extend(self.model.toJSON(), {
380-
backToTopTmpl: backToTopTmpl
387+
backToTopTmpl: backToTopTmpl,
388+
short_website: self.short_website
381389
})
382390
));
383391
self.fetchReviews();
@@ -1839,6 +1847,12 @@ UserPageVw = pageVw.extend({
18391847
$('#obContainer').off('scroll', this.onScroll).removeClass('customizeUserPage ');
18401848

18411849
pageVw.prototype.remove.apply(this, arguments);
1850+
},
1851+
1852+
trimUrl: function(url) {
1853+
var parser = document.createElement('a');
1854+
parser.href = url;
1855+
return parser.hostname;
18421856
}
18431857

18441858
});

0 commit comments

Comments
 (0)