diff --git a/core/modules/user/user.js b/core/modules/user/user.js index 47d5595..cf31ce9 100644 --- a/core/modules/user/user.js +++ b/core/modules/user/user.js @@ -8,83 +8,83 @@ */ Drupal.behaviors.password = { attach: function (context, settings) { - var $passwordInput = $(context).find('input.password-field').once('password'); + var $passwordInput = $(context).find('input.password-field').once('password'); - if ($passwordInput.length) { - var translate = settings.password; + if ($passwordInput.length) { + var translate = settings.password; - var $passwordInputParent = $passwordInput.parent(); - var $passwordInputParentWrapper = $passwordInputParent.parent(); + var $passwordInputParent = $passwordInput.parent(); + var $passwordInputParentWrapper = $passwordInputParent.parent(); - // Add identifying class to password element parent. - $passwordInputParent.addClass('password-parent'); + // Add identifying class to password element parent. + $passwordInputParent.addClass('password-parent'); - // Add the password confirmation layer. - $passwordInputParentWrapper - .find('input.password-confirm') - .parent() - .append('
' + translate.confirmTitle + '
') - .addClass('confirm-parent'); + // Add the password confirmation layer. + $passwordInputParentWrapper + .find('input.password-confirm') + .parent() + .append('
' + translate.confirmTitle + '
') + .addClass('confirm-parent'); - var $confirmInput = $passwordInputParentWrapper.find('input.password-confirm'); - var $confirmResult = $passwordInputParentWrapper.find('div.password-confirm'); - var $confirmChild = $confirmResult.find('span'); + var $confirmInput = $passwordInputParentWrapper.find('input.password-confirm'); + var $confirmResult = $passwordInputParentWrapper.find('div.password-confirm'); + var $confirmChild = $confirmResult.find('span'); // If the password strength indicator is enabled, add its markup. - if (settings.password.showStrengthIndicator) { + if (translate.showStrengthIndicator) { var passwordMeter = '
' + translate.strengthTitle + '
'; - $confirmInput.parent().after('
'); - $passwordInputParent.append(passwordMeter); - var $passwordSuggestions = $passwordInputParentWrapper.find('div.password-suggestions').hide(); + $confirmInput.parent().after('
'); + $passwordInputParent.append(passwordMeter); + var $passwordSuggestions = $passwordInputParentWrapper.find('div.password-suggestions').hide(); } // Check that password and confirmation inputs match. var passwordCheckMatch = function (confirmInputVal) { - var success = $passwordInput.val() === confirmInputVal; + var success = $passwordInput.val() === confirmInputVal; var confirmClass = success ? 'ok' : 'error'; // Fill in the success message and set the class accordingly. - $confirmChild.html(translate['confirm' + (success ? 'Success' : 'Failure')]) + $confirmChild.html(translate['confirm' + (success ? 'Success' : 'Failure')]) .removeClass('ok error').addClass(confirmClass); }; // Check the password strength. var passwordCheck = function () { - if (settings.password.showStrengthIndicator) { + if (translate.showStrengthIndicator) { // Evaluate the password strength. - var result = Drupal.evaluatePasswordStrength($passwordInput.val(), settings.password); + var result = Drupal.evaluatePasswordStrength($passwordInput.val(), translate); // Update the suggestions for how to improve the password. - if ($passwordSuggestions.html() !== result.message) { - $passwordSuggestions.html(result.message); + if ($passwordSuggestions.html() !== result.message) { + $passwordSuggestions.html(result.message); } // Only show the description box if a weakness exists in the password. - $passwordSuggestions.toggle(result.strength !== 100); + $passwordSuggestions.toggle(result.strength !== 100); // Adjust the length of the strength indicator. - $passwordInputParent.find('.indicator') - .css('width', result.strength + '%') - .css('background-color', result.indicatorColor); + $passwordInputParent.find('.indicator') + .css('width', result.strength + '%') + .css('background-color', result.indicatorColor); // Update the strength indication text. - $passwordInputParent.find('.password-strength-text').html(result.indicatorText); + $passwordInputParent.find('.password-strength-text').html(result.indicatorText); } // Check the value in the confirm input and show results. - if ($confirmInput.val()) { - passwordCheckMatch($confirmInput.val()); - $confirmResult.css({ visibility: 'visible' }); + if ($confirmInput.val()) { + passwordCheckMatch($confirmInput.val()); + $confirmResult.css({ visibility: 'visible' }); } else { - $confirmResult.css({ visibility: 'hidden' }); + $confirmResult.css({ visibility: 'hidden' }); } }; - // Monitor input events. - $passwordInput.on('input', passwordCheck); - $confirmInput.on('input', passwordCheck); - } + // Monitor input events. + $passwordInput.on('input', passwordCheck); + $confirmInput.on('input', passwordCheck); + } } }; @@ -96,15 +96,15 @@ Drupal.evaluatePasswordStrength = function (password, translate) { var indicatorText, indicatorColor, weaknesses = 0, strength = 100, msg = []; - var hasLowercase = /[a-z]/.test(password); - var hasUppercase = /[A-Z]/.test(password); - var hasNumbers = /[0-9]/.test(password); - var hasPunctuation = /[^a-zA-Z0-9]/.test(password); + var hasLowercase = /[a-z]/.test(password); + var hasUppercase = /[A-Z]/.test(password); + var hasNumbers = /[0-9]/.test(password); + var hasPunctuation = /[^a-zA-Z0-9]/.test(password); // If there is a username edit box on the page, compare password to that, otherwise // use value from the database. - var $usernameInput = $('input.username'); - var username = ($usernameInput.length > 0) ? $usernameInput.val() : translate.username; + var $usernameInput = $('input.username'); + var username = ($usernameInput.length > 0) ? $usernameInput.val() : translate.username; // Lose 5 points for every character less than 6, plus a 30 point penalty. if (password.length < 6) { @@ -174,12 +174,12 @@ // Assemble the final message. msg = translate.hasWeaknesses + ''; - return { - strength: strength, - message: msg, - indicatorText: indicatorText, - indicatorColor: indicatorColor - }; + return { + strength: strength, + message: msg, + indicatorText: indicatorText, + indicatorColor: indicatorColor + }; }; @@ -189,7 +189,7 @@ */ Drupal.behaviors.fieldUserRegistration = { attach: function (context, settings) { - var $checkbox = $('#field-ui-field-edit-form #edit-instance-settings-user-register-form'); + var $checkbox = $('#field-ui-field-edit-form #edit-instance-settings-user-register-form'); if ($checkbox.length) { $(context).find('input#edit-instance-required').once('user-register-form-checkbox', function () { diff --git a/core/modules/user/user.permissions.js b/core/modules/user/user.permissions.js index 4c68737..7de8487 100644 --- a/core/modules/user/user.permissions.js +++ b/core/modules/user/user.permissions.js @@ -8,16 +8,16 @@ Drupal.behaviors.permissions = { attach: function (context) { var self = this; - var $table = $('#permissions').once('permissions'); - if($table.length) { + var $table = $('#permissions').once('permissions'); + if($table.length) { // On a site with many roles and permissions, this behavior initially has // to perform thousands of DOM manipulations to inject checkboxes and hide // them. By detaching the table from the DOM, all operations can be // performed without triggering internal layout and re-rendering processes // in the browser. - var method; - var $ancestor = $table.prev(); - if ($ancestor.length) { + var method; + var $ancestor = $table.prev(); + if ($ancestor.length) { method = 'after'; } else { @@ -35,14 +35,14 @@ .attr('title', Drupal.t("This permission is inherited from the authenticated user role.")) .hide(); - $table - .find('input[type="checkbox"]') - .not('.rid-anonymous, .rid-authenticated') - .addClass('real-checkbox') - .after($dummy); + $table + .find('input[type="checkbox"]') + .not('.rid-anonymous, .rid-authenticated') + .addClass('real-checkbox') + .after($dummy); // Initialize the authenticated user checkbox. - $table.find('input[type=checkbox].rid-authenticated') + $table.find('input[type="checkbox"].rid-authenticated') .on('click.permissions', self.toggle) // .triggerHandler() cannot be used here, as it only affects the first // element. @@ -50,7 +50,7 @@ // Re-insert the table into the DOM. $ancestor[method]($table); - } + } }, /**