aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2014-12-18 23:18:37 +0100
committerJörn Friedrich Dreyer <jfd@butonic.de>2014-12-18 23:18:37 +0100
commit891474b0d6b8cc77a8480cd91f1e48ad3bc3e73b (patch)
treededc4a94ec16651266bf15d46a6687efb901c63e /settings
parent49318b4d93b4dc5fbd58fa87b2efa8f1577fb7b7 (diff)
parent51a22431ee824357dce0100cb000032f29aabd47 (diff)
downloadnextcloud-server-891474b0d6b8cc77a8480cd91f1e48ad3bc3e73b.tar.gz
nextcloud-server-891474b0d6b8cc77a8480cd91f1e48ad3bc3e73b.zip
Merge pull request #12759 from owncloud/core-reduce-js-and-css
make sure styles and scripts are only loaded once
Diffstat (limited to 'settings')
-rw-r--r--settings/js/personal.js1
-rw-r--r--settings/templates/personal.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js
index b2efa7c37f9..ac29f69037e 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -157,6 +157,7 @@ function avatarResponseHandler (data) {
}
$(document).ready(function () {
+ $('#pass2').showPassword().keyup();
$("#passwordbutton").click(function () {
if ($('#pass1').val() !== '' && $('#pass2').val() !== '') {
// Serialize the data
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index cc04de5ec38..913c5803f6d 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -63,6 +63,7 @@
<?php
if($_['passwordChangeSupported']) {
+ script('jquery-showpassword');
?>
<form id="passwordform" class="section">
<h2><?php p($l->t('Password'));?></h2>