From b71312b8ebb6714fa1df17b5d7326739caa69b75 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 6 Jul 2021 17:01:25 +0300 Subject: [PATCH] url allow any protocol --- client/src/views/fields/url.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/client/src/views/fields/url.js b/client/src/views/fields/url.js index 8fabf6da82..2c497d7fd5 100644 --- a/client/src/views/fields/url.js +++ b/client/src/views/fields/url.js @@ -36,6 +36,8 @@ define('views/fields/url', ['views/fields/varchar', 'lib!underscore'], function detailTemplate: 'fields/url/detail', + defaultProtocol: 'https:', + setup: function () { Dep.prototype.setup.call(this); @@ -67,11 +69,8 @@ define('views/fields/url', ['views/fields/varchar', 'lib!underscore'], function strip: function (value) { value = value.trim(); - if (value.indexOf('http://') === 0) { - value = value.substr(7); - } - else if (value.indexOf('https://') === 0) { - value = value.substr(8); + if (value.indexOf('//') !== -1) { + value = value.substr(value.indexOf('//') + 2); } value = value.replace(/\/+$/, ''); @@ -83,8 +82,8 @@ define('views/fields/url', ['views/fields/varchar', 'lib!underscore'], function var url = this.model.get(this.name); if (url && url !== '') { - if (!(url.indexOf('http://') === 0) && !(url.indexOf('https://') === 0)) { - url = 'http://' + url; + if (url.indexOf('//') === -1) { + url = this.defaultProtocol + '//' + url; } return url;