From 00c29705470141ff0d4d9f72afbbac0b1369eb35 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 9 Apr 2015 14:40:00 +0200
Subject: [PATCH] update back/continue buttons also on tab click
---
apps/user_ldap/js/wizard/view.js | 4 ++++
apps/user_ldap/js/wizard/wizard.js | 6 +++---
apps/user_ldap/js/wizard/wizardTabElementary.js | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/apps/user_ldap/js/wizard/view.js b/apps/user_ldap/js/wizard/view.js
index 96f700f8f1..7743c277d6 100644
--- a/apps/user_ldap/js/wizard/view.js
+++ b/apps/user_ldap/js/wizard/view.js
@@ -225,6 +225,10 @@ OCA = OCA || {};
} else {
console.warn('Unreferenced left tab ' + oldTabID);
}
+
+ if(!_.isUndefined(this.tabs[newTabID])) {
+ this._controlUpdate(this.tabs[newTabID].tabIndex);
+ }
},
/**
diff --git a/apps/user_ldap/js/wizard/wizard.js b/apps/user_ldap/js/wizard/wizard.js
index faa9de918a..e8450d1c78 100644
--- a/apps/user_ldap/js/wizard/wizard.js
+++ b/apps/user_ldap/js/wizard/wizard.js
@@ -52,9 +52,9 @@ OCA = OCA || {};
var filterOnTypeFactory = new OCA.LDAP.Wizard.FilterOnTypeFactory();
var tabs = [];
- tabs.push(new OCA.LDAP.Wizard.WizardTabUserFilter(filterOnTypeFactory));
- tabs.push(new OCA.LDAP.Wizard.WizardTabLoginFilter());
- tabs.push(new OCA.LDAP.Wizard.WizardTabGroupFilter(filterOnTypeFactory));
+ tabs.push(new OCA.LDAP.Wizard.WizardTabUserFilter(filterOnTypeFactory, 1));
+ tabs.push(new OCA.LDAP.Wizard.WizardTabLoginFilter(2));
+ tabs.push(new OCA.LDAP.Wizard.WizardTabGroupFilter(filterOnTypeFactory, 3));
tabs.push(new OCA.LDAP.Wizard.WizardTabAdvanced());
tabs.push(new OCA.LDAP.Wizard.WizardTabExpert());
diff --git a/apps/user_ldap/js/wizard/wizardTabElementary.js b/apps/user_ldap/js/wizard/wizardTabElementary.js
index 31318dd0b2..f4a966328c 100644
--- a/apps/user_ldap/js/wizard/wizardTabElementary.js
+++ b/apps/user_ldap/js/wizard/wizardTabElementary.js
@@ -21,6 +21,7 @@ OCA = OCA || {};
* @param tabID
*/
init: function (tabIndex, tabID) {
+ tabIndex = 0;
this._super(tabIndex, tabID);
this.isActive = true;
this.configChooserID = '#ldap_serverconfig_chooser';
--
GitLab