summaryrefslogtreecommitdiffstatshomepage
path: root/core/misc/machine-name.js
diff options
context:
space:
mode:
Diffstat (limited to 'core/misc/machine-name.js')
-rw-r--r--core/misc/machine-name.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/core/misc/machine-name.js b/core/misc/machine-name.js
index 636250f9762b..c065e70a863b 100644
--- a/core/misc/machine-name.js
+++ b/core/misc/machine-name.js
@@ -25,7 +25,6 @@
var data = e.data;
var options = data.options;
var baseValue = $(e.target).val();
-
var rx = new RegExp(options.replace_pattern, 'g');
var expected = baseValue.toLowerCase().replace(rx, options.replace).substr(0, options.maxlength);
@@ -38,6 +37,7 @@
clearTimeout(timeout);
timeout = null;
}
+
if (baseValue.toLowerCase() !== expected) {
timeout = setTimeout(function () {
xhr = self.transliterate(baseValue, options).done(function (machine) {
@@ -52,7 +52,6 @@
Object.keys(settings.machineName).forEach(function (sourceId) {
var machine = '';
var options = settings.machineName[sourceId];
-
var $source = $context.find(sourceId).addClass('machine-name-source').once('machine-name');
var $target = $context.find(options.target).addClass('machine-name-target');
var $suffix = $context.find(options.suffix);
@@ -67,7 +66,6 @@
}
options.maxlength = $target.attr('maxlength');
-
$wrapper.addClass('visually-hidden');
if ($target.is(':disabled') || $target.val() !== '') {
@@ -76,11 +74,13 @@
machine = self.transliterate($source.val(), options);
}
- var $preview = $('<span class="machine-name-value">' + options.field_prefix + Drupal.checkPlain(machine) + options.field_suffix + '</span>');
+ var $preview = $("<span class=\"machine-name-value\">".concat(options.field_prefix).concat(Drupal.checkPlain(machine)).concat(options.field_suffix, "</span>"));
$suffix.empty();
+
if (options.label) {
- $suffix.append('<span class="machine-name-label">' + options.label + ': </span>');
+ $suffix.append("<span class=\"machine-name-label\">".concat(options.label, ": </span>"));
}
+
$suffix.append($preview);
if ($target.is(':disabled')) {
@@ -95,8 +95,7 @@
$preview: $preview,
options: options
};
-
- var $link = $('<span class="admin-link"><button type="button" class="link">' + Drupal.t('Edit') + '</button></span>').on('click', eventData, clickEditHandler);
+ var $link = $("<span class=\"admin-link\"><button type=\"button\" class=\"link\">".concat(Drupal.t('Edit'), "</button></span>")).on('click', eventData, clickEditHandler);
$suffix.append($link);
if ($target.val() === '') {
@@ -114,6 +113,7 @@
data.$target.val(machine);
data.$preview.html(settings.field_prefix + Drupal.checkPlain(machine) + settings.field_suffix);
}
+
data.$suffix.show();
} else {
data.$suffix.hide();