Merge pull request #23239 from st3iny/fix/20833/broken-dbpassword-toggle

Fix database password visibility toggle
nextcloud · Oct 10, 2020 · 081c974 · 081c974
2 parents 4295fe6 + cb68bce
commit 081c974
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 21 deletions.
diff --git a/core/js/dist/files_client.js b/core/js/dist/files_client.js
diff --git a/core/js/dist/files_client.js.map b/core/js/dist/files_client.js.map
diff --git a/core/js/dist/files_fileinfo.js b/core/js/dist/files_fileinfo.js
diff --git a/core/js/dist/files_fileinfo.js.map b/core/js/dist/files_fileinfo.js.map
diff --git a/core/js/dist/files_iedavclient.js b/core/js/dist/files_iedavclient.js
diff --git a/core/js/dist/files_iedavclient.js.map b/core/js/dist/files_iedavclient.js.map
diff --git a/core/js/dist/install.js b/core/js/dist/install.js
diff --git a/core/js/dist/install.js.map b/core/js/dist/install.js.map
diff --git a/core/js/dist/login.js b/core/js/dist/login.js
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
diff --git a/core/js/dist/maintenance.js b/core/js/dist/maintenance.js
diff --git a/core/js/dist/maintenance.js.map b/core/js/dist/maintenance.js.map
diff --git a/core/js/dist/recommendedapps.js b/core/js/dist/recommendedapps.js
diff --git a/core/js/dist/recommendedapps.js.map b/core/js/dist/recommendedapps.js.map
diff --git a/core/js/dist/unified-search.js b/core/js/dist/unified-search.js
diff --git a/core/js/dist/unified-search.js.map b/core/js/dist/unified-search.js.map
diff --git a/core/src/install.js b/core/src/install.js
@@ -3,6 +3,8 @@ import { translate as t } from '@nextcloud/l10n'
 import { getToken } from './OC/requesttoken'
 import getURLParameter from './Util/get-url-parameter'
 
+import './jquery/showpassword'
+
 import 'jquery-ui/ui/widgets/button'
 import 'jquery-ui/themes/base/theme.css'
 import 'jquery-ui/themes/base/button.css'
@@ -134,4 +136,7 @@ window.addEventListener('DOMContentLoaded', function() {
 		drawTitles: true,
 		nonce: btoa(getToken()),
 	})
+
+	$('#dbpass').showPassword().keyup()
+	$('#adminpass').showPassword().keyup()
 })
diff --git a/core/templates/installation.php b/core/templates/installation.php
@@ -49,8 +49,8 @@
 				value="<?php p($_['adminpass']); ?>"
 				autocomplete="off" autocapitalize="none" autocorrect="off" required>
 			<label for="adminpass" class="infield"><?php p($l->t('Password')); ?></label>
-			<input type="checkbox" id="show" class="hidden-visually" name="show">
-			<label for="show" class="hidden-visually"><?php p($l->t('Show password')); ?></label>
+			<input type="checkbox" id="show" class="hidden-visually" name="show" aria-label="<?php p($l->t('Show password')); ?>">
+			<label for="show"></label>
 		</p>
 	</fieldset>
 
@@ -115,7 +115,7 @@
 					value="<?php p($_['dbpass']); ?>"
 					autocomplete="off" autocapitalize="none" autocorrect="off">
 				<label for="dbpass" class="infield"><?php p($l->t('Database password')); ?></label>
-				<input type="checkbox" id="dbpassword-toggle" class="hidden-visually" name="dbpassword-toggle">
+				<input type="checkbox" id="dbpassword-toggle" class="hidden-visually" name="dbpassword-toggle" aria-label="<?php p($l->t('Show password')); ?>">
 				<label for="dbpassword-toggle"></label>
 			</p>
 			<p class="groupmiddle">