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

- Patch #1684880 by droplet, nod_: JSHint user.

8.0.x
Dries 2012-07-14 21:26:48 -04:00
parent 811885d701
commit dbd50142e2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/user/user.js
View File

@ -18,13 +18,13 @@ Drupal.behaviors.password = {
innerWrapper.addClass('password-parent');
// Add the password confirmation layer.
outerWrapper.find('input.password-confirm').parent().prepend('<div class="password-confirm">' + translate['confirmTitle'] + ' <span></span></div>').addClass('confirm-parent');
outerWrapper.find('input.password-confirm').parent().prepend('<div class="password-confirm">' + translate.confirmTitle + ' <span></span></div>').addClass('confirm-parent');
var confirmInput = outerWrapper.find('input.password-confirm');
var confirmResult = outerWrapper.find('div.password-confirm');
var confirmChild = confirmResult.find('span');
// Add the description box.
var passwordMeter = '<div class="password-strength"><div class="password-strength-text" aria-live="assertive"></div><div class="password-strength-title">' + translate['strengthTitle'] + '</div><div class="password-indicator"><div class="indicator"></div></div></div>';
var passwordMeter = '<div class="password-strength"><div class="password-strength-text" aria-live="assertive"></div><div class="password-strength-title">' + translate.strengthTitle + '</div><div class="password-indicator"><div class="indicator"></div></div></div>';
confirmInput.parent().after('<div class="password-suggestions description"></div>');
innerWrapper.prepend(passwordMeter);
var passwordDescription = outerWrapper.find('div.password-suggestions').hide();
@ -159,7 +159,6 @@ Drupal.evaluatePasswordStrength = function (password, translate) {
strength = 5;
}
var indicatorText;
// Based on the strength, work out what text should be shown by the password strength meter.
if (strength < 60) {
indicatorText = translate.weak;

7
core/modules/user/user.permissions.js
View File

@ -15,11 +15,14 @@ Drupal.behaviors.permissions = {
// performed without triggering internal layout and re-rendering processes
// in the browser.
var $table = $(this);
var $ancestor, method;
if ($table.prev().length) {
var $ancestor = $table.prev(), method = 'after';
$ancestor = $table.prev();
method = 'after';
}
else {
var $ancestor = $table.parent(), method = 'append';
$ancestor = $table.parent();
method = 'append';
}
$table.detach();