diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-24 17:33:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 17:33:04 +0300 |
| commit | b42d8ca77d2234b612179926f35146e11bffd764 (patch) | |
| tree | f0772c0d3723160fe50c516e5da1d71746f1e756 /core | |
| parent | f8da92d8faa687aeee4606639fe96877e1eb26ea (diff) | |
| parent | a99489d602f4e42b9f18454fc46d949c2b072e0c (diff) | |
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
Diffstat (limited to 'core')
| -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 |
3 files changed, 14 insertions, 8 deletions
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) |