diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-01 22:57:46 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-01 22:57:46 +0200 |
| commit | 9eab8b39df34b507530b0beceb31eb23fbea54f5 (patch) | |
| tree | 6b53d3f1b9aabd9d62092f1ad7b2568bd55b5c51 /settings/js | |
| parent | ce58c32c901fb874264922dabec1692f9d05123d (diff) | |
| parent | 5ade595911261cf47cdad17deb4d1a013f523245 (diff) | |
| download | nextcloud-server-9eab8b39df34b507530b0beceb31eb23fbea54f5.tar.gz nextcloud-server-9eab8b39df34b507530b0beceb31eb23fbea54f5.zip | |
Merge branch 'master' into fixing-4620-master
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/apps.js | 4 | ||||
| -rw-r--r-- | settings/js/personal.js | 12 | ||||
| -rw-r--r-- | settings/js/users.js | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index 54810776d2b..a55c55e24cf 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -84,6 +84,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } else { appitem.data('active',false); + element.data('active',false); OC.Settings.Apps.removeNavigation(appid); appitem.removeClass('active'); element.val(t('settings','Enable')); @@ -104,6 +105,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } else { OC.Settings.Apps.addNavigation(appid); appitem.data('active',true); + element.data('active',true); appitem.addClass('active'); element.val(t('settings','Disable')); } @@ -158,7 +160,7 @@ OC.Settings.Apps = OC.Settings.Apps || { if(response.status === 'success'){ var navIds=response.nav_ids; for(var i=0; i< navIds.length; i++){ - $('#apps').children('li[data-id="'+navIds[i]+'"]').remove(); + $('#apps .wrapper').children('li[data-id="'+navIds[i]+'"]').remove(); } } }); diff --git a/settings/js/personal.js b/settings/js/personal.js index fab32b83b64..a923b475731 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -34,6 +34,7 @@ function changeDisplayName(){ $('#oldDisplayName').text($('#displayName').val()); // update displayName on the top right expand button $('#expandDisplayName').text($('#displayName').val()); + updateAvatar(); } else{ $('#newdisplayname').val(data.data.displayName); @@ -124,14 +125,17 @@ $(document).ready(function(){ $('#passwordchanged').hide(); $('#passworderror').hide(); // Ajax foo - $.post( 'ajax/changepassword.php', post, function(data){ + $.post(OC.Router.generate('settings_personal_changepassword'), post, function(data){ if( data.status === "success" ){ $('#pass1').val(''); $('#pass2').val(''); $('#passwordchanged').show(); - } - else{ - $('#passworderror').html( data.data.message ); + } else{ + if (typeof(data.data) !== "undefined") { + $('#passworderror').html(data.data.message); + } else { + $('#passworderror').html(t('Unable to change password')); + } $('#passworderror').show(); } }); diff --git a/settings/js/users.js b/settings/js/users.js index 01a845367e2..48c4529527b 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -361,7 +361,7 @@ $(document).ready(function () { if ($(this).val().length > 0) { var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val(); $.post( - OC.filePath('settings', 'ajax', 'changepassword.php'), + OC.Router.generate('settings_users_changepassword'), {username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal}, function (result) { if (result.status != 'success') { |