diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-02-26 00:19:42 -0800 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-02-26 00:19:42 -0800 |
| commit | 072daf8850c87b070c3dad921c16246d095d9cb2 (patch) | |
| tree | d2b02cb083a692f85b9b351c978bdc4b0120008b | |
| parent | 63d9feb8c0e7a6458efa93f0e56bacaffe572631 (diff) | |
| parent | 02da5d5d525778a250c000af0e3da7360b4719e5 (diff) | |
| download | nextcloud-server-072daf8850c87b070c3dad921c16246d095d9cb2.tar.gz nextcloud-server-072daf8850c87b070c3dad921c16246d095d9cb2.zip | |
Merge pull request #1885 from houqp/issue_1776
when user changes displayName, also update it on expand button
| -rw-r--r-- | core/templates/layout.user.php | 2 | ||||
| -rw-r--r-- | settings/js/personal.js | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 3bc1903876e..7a677b88345 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -34,7 +34,7 @@ <ul id="settings" class="svg"> <span id="expand"> - <?php echo $_['user_displayname'] ?> + <span id="expandDisplayName"><?php echo $_['user_displayname'] ?></span> <img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" /> </span> <div id="expanddiv"> diff --git a/settings/js/personal.js b/settings/js/personal.js index d9455b3786b..d0a471e56b5 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -31,7 +31,7 @@ $(document).ready(function(){ } }); - + $("#displaynamebutton").click( function(){ if ($('#displayName').val() != '' ) { // Serialize the data @@ -42,6 +42,9 @@ $(document).ready(function(){ $.post( 'ajax/changedisplayname.php', post, function(data){ if( data.status == "success" ){ $('#displaynamechanged').show(); + $('#oldDisplayName').text($('#displayName').val()); + // update displayName on the top right expand button + $('#expandDisplayName').text($('#displayName').val()); } else{ $('#newdisplayname').val(data.data.displayName) |