Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2015-04-09 15:40:00 +0300
committerArthur Schiwon <blizzz@owncloud.com>2015-04-09 15:40:00 +0300
commit00c29705470141ff0d4d9f72afbbac0b1369eb35 (patch)
treee5cf7e876dbd7fe36b335fac3c31ec69e3791e62 /apps/user_ldap/js
parentb4c96e6ba0d37b7e2f1fb6aa838c856101ae0c6d (diff)
update back/continue buttons also on tab click
Diffstat (limited to 'apps/user_ldap/js')
-rw-r--r--apps/user_ldap/js/wizard/view.js4
-rw-r--r--apps/user_ldap/js/wizard/wizard.js6
-rw-r--r--apps/user_ldap/js/wizard/wizardTabElementary.js1
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 96f700f8f1a..7743c277d61 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 faa9de918a4..e8450d1c78f 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 31318dd0b2e..f4a966328c1 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';