diff options
| author | TheSFReader <TheSFReader@gmail.com> | 2013-01-26 23:19:40 +0100 |
|---|---|---|
| committer | TheSFReader <TheSFReader@gmail.com> | 2013-01-26 23:19:40 +0100 |
| commit | 9c7a18044d9d53161a157bcdd1d394d6d75f42da (patch) | |
| tree | 0cedeb0e33e614b672c24c8d9909af6f233c19e5 /settings/js/users.js | |
| parent | 2aead5727ed99c9b9af3a2ba653a27cf794e1278 (diff) | |
| parent | c9e25d3fab17b178759dd6d2f9488aa4cf37fbbb (diff) | |
| download | nextcloud-server-9c7a18044d9d53161a157bcdd1d394d6d75f42da.tar.gz nextcloud-server-9c7a18044d9d53161a157bcdd1d394d6d75f42da.zip | |
Merge remote-tracking branch 'refs/remotes/upstream/master'
Diffstat (limited to 'settings/js/users.js')
| -rw-r--r-- | settings/js/users.js | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/settings/js/users.js b/settings/js/users.js index fa6f058d923..9f0c1ffd111 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -26,9 +26,8 @@ var UserList = { UserList.deleteCanceled = false; // Provide user with option to undo - $('#notification').html(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>'); $('#notification').data('deleteuser', true); - $('#notification').fadeIn(); + OC.Notification.showHtml(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>'); }, /** @@ -53,7 +52,7 @@ var UserList = { success:function (result) { if (result.status == 'success') { // Remove undo option, & remove user from table - $('#notification').fadeOut(); + OC.Notification.hide(); $('tr').filterAttr('data-uid', UserList.deleteUid).remove(); UserList.deleteCanceled = true; if (ready) { @@ -197,7 +196,7 @@ var UserList = { checked:checked, oncheck:checkHandeler, onuncheck:checkHandeler, - minWidth:100, + minWidth:100 }); } if ($(element).attr('class') == 'subadminsselect') { @@ -232,7 +231,7 @@ var UserList = { checked:checked, oncheck:checkHandeler, onuncheck:checkHandeler, - minWidth:100, + minWidth:100 }); } } @@ -389,7 +388,7 @@ $(document).ready(function () { { username:username, password:password, - groups:groups, + groups:groups }, function (result) { if (result.status != 'success') { @@ -402,13 +401,13 @@ $(document).ready(function () { ); }); // Handle undo notifications - $('#notification').hide(); + OC.Notification.hide(); $('#notification .undo').live('click', function () { if ($('#notification').data('deleteuser')) { $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show(); UserList.deleteCanceled = true; } - $('#notification').fadeOut(); + OC.Notification.hide(); }); UserList.useUndo = ('onbeforeunload' in window) $(window).bind('beforeunload', function () { |