Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable12] Fix password displayed as username in Firefox password manager dialog #7797

Merged
merged 3 commits into from
Jan 24, 2018
Merged

[stable12] Fix password displayed as username in Firefox password manager dialog #7797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43c8a21
Fix password displayed as username in Firefox password manager dialog
danxuliu Jan 5, 2018
33c55fe
Bump strengthify to 0.5.3
rullzer Jan 10, 2018
a99489d
Add strengthify bar after plain text input clone of password input
danxuliu Jan 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/user_ldap/js/renewPassword.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,6 @@ $(document).ready(function() {
t('core', 'Strong password')
],
drawTitles: true,
$addAfter: $('input[name="newPassword-clone"]'),
});
});
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"select2": "~3.4.8",
"zxcvbn": "*",
"snapjs": "~2.0.0-rc1",
"strengthify": "^0.5.2",
"strengthify": "^0.5.3",
"underscore": "~1.8.0",
"bootstrap": "~3.3.6",
"backbone": "~1.2.3",
Expand Down
2 changes: 1 addition & 1 deletion core/js/jquery-showpassword.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

// Create clone
var $clone = cloneElement($input);
$clone.insertBefore($input);
$clone.insertAfter($input);

// Set callback arguments
if(callback.fn){
Expand Down
10 changes: 5 additions & 5 deletions core/vendor/strengthify/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strengthify",
"version": "0.5.2",
"version": "0.5.3",
"homepage": "https://github.com/MorrisJobke/strengthify",
"authors": [
"Eve Ragins <eve.ragins@eve-corp.com",
Expand All @@ -9,13 +9,13 @@
"description": "Combine jQuery and zxcvbn to create a password strength meter.",
"main": "jquery.strengthify.js",
"license": "MIT",
"_release": "0.5.2",
"_release": "0.5.3",
"_resolution": {
"type": "version",
"tag": "0.5.2",
"commit": "82d63c39de1b7b60ae38d24d0f866cba325904b5"
"tag": "0.5.3",
"commit": "a97e861762ccb17ce5f51d5c608b5d9e42732ae3"
},
"_source": "https://github.com/MorrisJobke/strengthify.git",
"_target": "^0.5.2",
"_target": "^0.5.3",
"_originalSource": "strengthify"
}
10 changes: 8 additions & 2 deletions core/vendor/strengthify/jquery.strengthify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
},
drawTitles: false,
drawMessage: false,
drawBars: true
drawBars: true,
$addAfter: null
};

return this.each(function() {
Expand Down Expand Up @@ -175,8 +176,13 @@
elemId = $elem.attr('id');
var drawSelf = drawStrengthify.bind(this);

var $addAfter = options.$addAfter;
if (!$addAfter) {
$addAfter = $elem;
}

// add elements
$elem.after('<div class="strengthify-wrapper" data-strengthifyFor="' + $elem.attr('id') + '"></div>');
$addAfter.after('<div class="strengthify-wrapper" data-strengthifyFor="' + $elem.attr('id') + '"></div>');

if (options.drawBars) {
getWrapperFor(elemId)
Expand Down
1 change: 1 addition & 0 deletions settings/js/personal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ $(document).ready(function () {
t('settings', 'Strong password')
],
drawTitles: true,
$addAfter: $('input[name="newpassword-clone"]'),
});

// Load the big avatar
Expand Down