remove hardcoded translations and rework link name placeholder behaviour

pull/1/head
ansuz 3 years ago
parent 2ca98425f2
commit 126a3fff46

@ -42,9 +42,6 @@ define([
Pages) Pages)
{ {
Messages.fm_link_new = "New Link"; // XXX
Messages.fm_link_type = "Link"; // XXX
var APP = window.APP = { var APP = window.APP = {
editable: false, editable: false,
online: false, online: false,
@ -2737,21 +2734,23 @@ define([
$input.click(); $input.click();
}; };
var showLinkModal = function () { var showLinkModal = function () {
Messages.fm_link_name = "Link name"; // XXX
Messages.fm_link_url = "URL"; // XXX
Messages.fm_link_warning = "Warning: URL size..."; // XXX
var name, url; var name, url;
var warning = h('div.alert.alert-warning', [ var warning = h('div.alert.alert-warning', [
h('i.fa.fa-exclamation-triangle'), h('i.fa.fa-exclamation-triangle'),
h('span', Messages.fm_link_warning) h('span', Messages.fm_link_warning)
]); ]);
var content = h('p', [ var content = h('p', [
warning,
h('label', {for: 'cp-app-drive-link-name'}, Messages.fm_link_name), h('label', {for: 'cp-app-drive-link-name'}, Messages.fm_link_name),
name = h('input#cp-app-drive-link-name', { autocomplete: 'off' }), name = h('input#cp-app-drive-link-name', { autocomplete: 'off', placeholder: Messages.fm_link_name_placeholder }),
h('label', {for: 'cp-app-drive-link-url'}, Messages.fm_link_url), h('label', {for: 'cp-app-drive-link-url'}, Messages.fm_link_url),
url = h('input#cp-app-drive-link-url', { type: 'url', autocomplete: 'off' }) url = h('input#cp-app-drive-link-url', { type: 'url', autocomplete: 'off', placeholder: Messages.form_input_ph_url }),
warning,
]); ]);
var setNamePlaceholder = function (val) {
val = val.replace(/https*:\/\//, '').replace(/#.*$/, '').slice(0, 16);
name.setAttribute('placeholder', val)
};
var $warning = $(warning).hide(); var $warning = $(warning).hide();
var $url = $(url).on('change keypress keyup keydown', function () { var $url = $(url).on('change keypress keyup keydown', function () {
var v = $url.val().trim(); var v = $url.val().trim();
@ -2759,6 +2758,7 @@ define([
$warning.show(); $warning.show();
return; return;
} }
setNamePlaceholder(v);
$warning.hide(); $warning.hide();
}); });
var buttons = [{ var buttons = [{
@ -2773,7 +2773,8 @@ define([
iconClass: '.fa.fa-plus', iconClass: '.fa.fa-plus',
name: Messages.tag_add, name: Messages.tag_add,
onClick: function () { onClick: function () {
var n = $(name).val().trim(); var $name = $(name);
var n = $name.val().trim() || $name.attr('placeholder');
var u = $url.val().trim(); var u = $url.val().trim();
if (!n || !u) { return true; } if (!n || !u) { return true; }
if (!Util.isValidURL(u)) { if (!Util.isValidURL(u)) {

Loading…
Cancel
Save