Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00
Code Issues Activity

Merge pull request #5013 from ErisDS/issue-4989-mailto

Browse source 
Accept mailto: links
This commit is contained in:
Sebastian Gierlinger 2015-03-09 16:15:15 +01:00
commit 40e98d27ef
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/client/components/gh-navitem-url-input.js
View file

@ -20,7 +20,7 @@ var NavItemUrlInputComponent = Ember.TextField.extend({
}), }),
isRelative: Ember.computed('value', function () { isRelative: Ember.computed('value', function () {
return !validator.isURL(this.get('value')); return !validator.isURL(this.get('value')) && this.get('value').indexOf('mailto:') !== 0;
}), }),
didInsertElement: function () { didInsertElement: function () {
@ -80,6 +80,7 @@ var NavItemUrlInputComponent = Ember.TextField.extend({
var url = this.get('value'), var url = this.get('value'),
baseUrl = this.get('baseUrl'); baseUrl = this.get('baseUrl');
// if we have a relative url, create the absolute url to be displayed in the input
if (this.get('isRelative')) { if (this.get('isRelative')) {
this.set('value', joinUrlParts(baseUrl, url)); this.set('value', joinUrlParts(baseUrl, url));
} }

2
core/client/controllers/settings/navigation.js
View file

@ -132,7 +132,7 @@ NavigationController = Ember.Controller.extend({
if (url[url.length - 1] !== '/') { if (url[url.length - 1] !== '/') {
url += '/'; url += '/';
} }
} else if (!validator.isURL(url) && url !== '' && url[0] !== '/') { } else if (!validator.isURL(url) && url !== '' && url[0] !== '/' && url.indexOf('mailto:') !== 0) {
url = '/' + url; url = '/' + url;
} }

2
core/server/config/url.js
View file

@ -170,7 +170,7 @@ function urlFor(context, data, absolute) {
} }
// This url already has a protocol so is likely an external url to be returned // This url already has a protocol so is likely an external url to be returned
if (urlPath && urlPath.indexOf('://') !== -1) { if (urlPath && (urlPath.indexOf('://') !== -1 || urlPath.indexOf('mailto:') === 0)) {
return urlPath; return urlPath;
} }