Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#576180 by Damien Tournoud: Fix name-spacing of machine-name generation javascript.

merge-requests/26/head
Angie Byron 2010-01-30 00:29:10 +00:00
parent af24809fed
commit b1d0d1340c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/system/system.js
View File

@ -165,10 +165,11 @@ Drupal.behaviors.pageCache = {
*/ */
Drupal.behaviors.machineReadableValue = { Drupal.behaviors.machineReadableValue = {
attach: function () { attach: function () {
var self = this;
for (var value in Drupal.settings.machineReadableValue) { for (var value in Drupal.settings.machineReadableValue) {
var settings = Drupal.settings.machineReadableValue[value]; var settings = Drupal.settings.machineReadableValue[value];
var searchPattern = new RegExp(settings.searchPattern, 'g');
// Build selector for the source name entered by a user. // Build selector for the source name entered by a user.
var source = '#edit-' + value; var source = '#edit-' + value;
var suffix = source + '-suffix'; var suffix = source + '-suffix';
@ -180,12 +181,12 @@ Drupal.behaviors.machineReadableValue = {
// Do not process the element if we got an error or the given name and the // Do not process the element if we got an error or the given name and the
// machine readable name are identical or the machine readable name is // machine readable name are identical or the machine readable name is
// empty. // empty.
if (!$(target).hasClass('error') && ($(target).val() == $(source).val().toLowerCase().replace(searchPattern, settings.replaceToken) || $(target).val() == '')) { if (!$(target).hasClass('error') && ($(target).val() == '' || $(target).val() == self.transliterate($(source).val(), settings))) {
// Hide wrapper element. // Hide wrapper element.
$(wrapper).hide(); $(wrapper).hide();
// Bind keyup event to source element. // Bind keyup event to source element.
$(source).keyup(function () { $(source).keyup(function () {
var machine = $(this).val().toLowerCase().replace(searchPattern, settings.replaceToken); var machine = self.transliterate($(this).val(), settings);
if (machine != '_' && machine != '') { if (machine != '_' && machine != '') {
// Set machine readable name to the user entered value. // Set machine readable name to the user entered value.
$(target).val(machine); $(target).val(machine);
@ -207,6 +208,17 @@ Drupal.behaviors.machineReadableValue = {
$(source).keyup(); $(source).keyup();
} }
} }
},
/**
* Transliterate a human-readable name to a machine name.
*
* The result should not contain any character matching settings.searchPattern,
* invalid characters are typically replaced with settings.replaceToken.
*/
transliterate: function (source, settings) {
var searchPattern = new RegExp(settings.searchPattern, 'g');
return source.toLowerCase().replace(searchPattern, settings.replaceToken);
} }
}; };