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

Fix password displayed as username in Firefox password manager dialog

apps/user_ldap/js/renewPassword.js

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

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",

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){	

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"
 }

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)

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