From 39aa5868ac970253a1edc3d4fc90763a44c85100 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 8 Oct 2014 14:55:47 +0200 Subject: [PATCH] rename internal var name to avoid collision --- apps/user_ldap/js/experiencedAdmin.js | 12 ++++++------ apps/user_ldap/js/settings.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/user_ldap/js/experiencedAdmin.js b/apps/user_ldap/js/experiencedAdmin.js index 4b30ed44d00..bd674a37d6c 100644 --- a/apps/user_ldap/js/experiencedAdmin.js +++ b/apps/user_ldap/js/experiencedAdmin.js @@ -13,8 +13,8 @@ */ function ExperiencedAdmin(wizard, initialState) { this.wizard = wizard; - this.isExperienced = initialState; - if(this.isExperienced) { + this._isExperienced = initialState; + if(this._isExperienced) { this.hideEntryCounters(); } } @@ -26,8 +26,8 @@ function ExperiencedAdmin(wizard, initialState) { * @param {boolean} whether the admin is experienced or not */ ExperiencedAdmin.prototype.setExperienced = function(isExperienced) { - this.isExperienced = isExperienced; - if(this.isExperienced) { + this._isExperienced = isExperienced; + if(this._isExperienced) { this.enableRawMode(); this.hideEntryCounters(); } else { @@ -41,7 +41,7 @@ ExperiencedAdmin.prototype.setExperienced = function(isExperienced) { * @return {boolean} whether the admin is experienced or not */ ExperiencedAdmin.prototype.isExperienced = function() { - return this.isExperienced; + return this._isExperienced; }; /** @@ -72,7 +72,7 @@ ExperiencedAdmin.prototype.updateGroupTab = function(mode) { ExperiencedAdmin.prototype._updateTab = function(mode, $countEl) { if(mode === LdapWizard.filterModeAssisted) { $countEl.removeClass('hidden'); - } else if(!this.isExperienced) { + } else if(!this._isExperienced) { $countEl.removeClass('hidden'); } else { $countEl.addClass('hidden'); diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js index 8ea303302ae..04b4b91d1f1 100644 --- a/apps/user_ldap/js/settings.js +++ b/apps/user_ldap/js/settings.js @@ -777,7 +777,7 @@ var LdapWizard = { }, onToggleRawFilterConfirmation: function(currentMode, callback) { - if(!LdapWizard.admin.isExperienced + if(!LdapWizard.admin.isExperienced() || currentMode === LdapWizard.filterModeAssisted ) { return callback(true); -- 2.39.5