summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2014-10-15 12:51:46 +0200
committerArthur Schiwon <blizzz@owncloud.com>2014-10-15 12:51:46 +0200
commitab6890b854cbe94d0ed816365b9acaf11f6eaa1f (patch)
tree4961bb9bfb9d723281755ffadf0d0aee53a2583c /apps
parent4385188920772d0f39656cc1d9a8012b173acabf (diff)
downloadnextcloud-server-ab6890b854cbe94d0ed816365b9acaf11f6eaa1f.tar.gz
nextcloud-server-ab6890b854cbe94d0ed816365b9acaf11f6eaa1f.zip
instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/js/settings.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 73cace33758..25b39ae71f0 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -675,6 +675,10 @@ var LdapWizard = {
/** end of init user filter tab section **/
onTabChange: function(event, ui) {
+ if(LdapWizard.saveProcesses > 0) {
+ //do not allow to switch tabs as long as a save process is active
+ return false;
+ }
newTabIndex = 0;
if(ui.newTab[0].id === '#ldapWizard2') {
LdapWizard.initUserFilter();
@@ -765,7 +769,6 @@ var LdapWizard = {
$('#ldap .ldap_saving').removeClass('hidden');
LdapWizard.saveProcesses += 1;
$('#ldap *').addClass('save-cursor');
- LdapWizard.disableTabs();
param = 'cfgkey='+encodeURIComponent(object.id)+
'&cfgval='+encodeURIComponent(value)+
'&action=save'+
@@ -778,11 +781,7 @@ var LdapWizard = {
LdapWizard.saveProcesses -= 1;
if(LdapWizard.saveProcesses === 0) {
$('#ldap .ldap_saving').addClass('hidden');
- console.log('switch cursor');
- console.log($('#ldap *').css('cursor'));
$('#ldap *').removeClass('save-cursor');
- //enable the tabs again, if everything is OK
- LdapWizard.basicStatusCheck();
console.log($('#ldap *').css('cursor'));
}
if(result.status === 'success') {