mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7797 from nextcloud/stable12-7709-fix-password-displayed-as-username-in-password-manager 

[stable12] Fix password displayed as username in Firefox password manager dialog
This commit is contained in:
Morris Jobke 2018-01-24 15:33:04 +01:00 committed by GitHub
parent f8da92d8fa a99489d602
commit b42d8ca77d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/user_ldap/js/renewPassword.js
View File

@ -46,5 +46,6 @@ $(document).ready(function() {
t('core', 'Strong password') t('core', 'Strong password')
], ],
drawTitles: true, drawTitles: true,
$addAfter: $('input[name="newPassword-clone"]'),
}); });
}); });

2
bower.json
View File

@ -25,7 +25,7 @@
"select2": "~3.4.8", "select2": "~3.4.8",
"zxcvbn": "*", "zxcvbn": "*",
"snapjs": "~2.0.0-rc1", "snapjs": "~2.0.0-rc1",
"strengthify": "^0.5.2", "strengthify": "^0.5.3",
"underscore": "~1.8.0", "underscore": "~1.8.0",
"bootstrap": "~3.3.6", "bootstrap": "~3.3.6",
"backbone": "~1.2.3", "backbone": "~1.2.3",

2
core/js/jquery-showpassword.js vendored
View File

@ -74,7 +74,7 @@
// Create clone // Create clone
var $clone = cloneElement($input); var $clone = cloneElement($input);
$clone.insertBefore($input); $clone.insertAfter($input);
// Set callback arguments // Set callback arguments
if(callback.fn){ if(callback.fn){

10
core/vendor/strengthify/.bower.json vendored
View File

@ -1,6 +1,6 @@
{ {
"name": "strengthify", "name": "strengthify",
"version": "0.5.2", "version": "0.5.3",
"homepage": "https://github.com/MorrisJobke/strengthify", "homepage": "https://github.com/MorrisJobke/strengthify",
"authors": [ "authors": [
"Eve Ragins <eve.ragins@eve-corp.com", "Eve Ragins <eve.ragins@eve-corp.com",
@ -9,13 +9,13 @@
"description": "Combine jQuery and zxcvbn to create a password strength meter.", "description": "Combine jQuery and zxcvbn to create a password strength meter.",
"main": "jquery.strengthify.js", "main": "jquery.strengthify.js",
"license": "MIT", "license": "MIT",
"_release": "0.5.2", "_release": "0.5.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "0.5.2", "tag": "0.5.3",
"commit": "82d63c39de1b7b60ae38d24d0f866cba325904b5" "commit": "a97e861762ccb17ce5f51d5c608b5d9e42732ae3"
}, },
"_source": "https://github.com/MorrisJobke/strengthify.git", "_source": "https://github.com/MorrisJobke/strengthify.git",
"_target": "^0.5.2", "_target": "^0.5.3",
"_originalSource": "strengthify" "_originalSource": "strengthify"
} }

10
core/vendor/strengthify/jquery.strengthify.js vendored
View File

@ -51,7 +51,8 @@
}, },
drawTitles: false, drawTitles: false,
drawMessage: false, drawMessage: false,
drawBars: true drawBars: true,
$addAfter: null
}; };
return this.each(function() { return this.each(function() {
@ -175,8 +176,13 @@
elemId = $elem.attr('id'); elemId = $elem.attr('id');
var drawSelf = drawStrengthify.bind(this); var drawSelf = drawStrengthify.bind(this);
var $addAfter = options.$addAfter;
if (!$addAfter) {
$addAfter = $elem;
}
// add elements // 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) { if (options.drawBars) {
getWrapperFor(elemId) getWrapperFor(elemId)

1
settings/js/personal.js
View File

@ -384,6 +384,7 @@ $(document).ready(function () {
t('settings', 'Strong password') t('settings', 'Strong password')
], ],
drawTitles: true, drawTitles: true,
$addAfter: $('input[name="newpassword-clone"]'),
}); });
// Load the big avatar // Load the big avatar