diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-11 17:21:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 17:21:35 +0300 |
| commit | 33b82f34be55bb5705222d7c146546ae54a29212 (patch) | |
| tree | 8e05058032de38798f93ae07c0518a867460d9a6 | |
| parent | aab39ba5bd59fc591481f034dd759b186e1cb26e (diff) | |
| parent | b83204bf2cac18ed2fa1f07770a172932392abcc (diff) | |
Merge pull request #7709 from nextcloud/fix-password-displayed-as-username-in-password-manager
Fix password displayed as username in Firefox password manager dialog
| -rw-r--r-- | apps/user_ldap/js/renewPassword.js | 1 | ||||
| -rw-r--r-- | bower.json | 2 | ||||
| -rw-r--r-- | core/js/jquery-showpassword.js | 2 | ||||
| -rw-r--r-- | core/vendor/strengthify/.bower.json | 10 | ||||
| -rw-r--r-- | core/vendor/strengthify/jquery.strengthify.js | 10 | ||||
| -rw-r--r-- | settings/js/settings/personalInfo.js | 1 |
6 files changed, 17 insertions, 9 deletions
diff --git a/apps/user_ldap/js/renewPassword.js b/apps/user_ldap/js/renewPassword.js index bea2c0409f7..7a58832c984 100644 --- a/apps/user_ldap/js/renewPassword.js +++ b/apps/user_ldap/js/renewPassword.js @@ -46,5 +46,6 @@ $(document).ready(function() { t('core', 'Strong password') ], drawTitles: true, + $addAfter: $('input[name="newPassword-clone"]'), }); }); diff --git a/bower.json b/bower.json index 3808a698163..d37a9244689 100644 --- a/bower.json +++ b/bower.json @@ -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", diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js index fc9de2170f9..5d518c78bcb 100644 --- a/core/js/jquery-showpassword.js +++ b/core/js/jquery-showpassword.js @@ -74,7 +74,7 @@ // Create clone var $clone = cloneElement($input); - $clone.insertBefore($input); + $clone.insertAfter($input); // Set callback arguments if(callback.fn){ diff --git a/core/vendor/strengthify/.bower.json b/core/vendor/strengthify/.bower.json index 9a5973c3116..de9904137ef 100644 --- a/core/vendor/strengthify/.bower.json +++ b/core/vendor/strengthify/.bower.json @@ -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", @@ -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" }
\ No newline at end of file diff --git a/core/vendor/strengthify/jquery.strengthify.js b/core/vendor/strengthify/jquery.strengthify.js index 046c2150210..204a0b33ccd 100644 --- a/core/vendor/strengthify/jquery.strengthify.js +++ b/core/vendor/strengthify/jquery.strengthify.js @@ -51,7 +51,8 @@ }, drawTitles: false, drawMessage: false, - drawBars: true + drawBars: true, + $addAfter: null }; return this.each(function() { @@ -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) diff --git a/settings/js/settings/personalInfo.js b/settings/js/settings/personalInfo.js index 0a39e607762..99254c42090 100644 --- a/settings/js/settings/personalInfo.js +++ b/settings/js/settings/personalInfo.js @@ -395,6 +395,7 @@ $(document).ready(function () { t('settings', 'Strong password') ], drawTitles: true, + $addAfter: $('input[name="newpassword-clone"]'), }); // Load the big avatar |