minor js refactoring

webapp/src/main/webapp/WEB-INF/jsp/admin-dashboard.jsp

@@ -487,12 +487,12 @@
 
             PWM_MAIN.addEventHandler('button-showLocalDBCounts','click',function(){
                 PWM_MAIN.showWaitDialog({loadFunction:function(){
-                        PWM_MAIN.goto('dashboard?showLocalDBCounts=true');
+                        PWM_MAIN.gotoUrl('dashboard?showLocalDBCounts=true');
                     }})
             });
             PWM_MAIN.addEventHandler('button-showThreadDetails','click',function(){
                 PWM_MAIN.showWaitDialog({loadFunction:function(){
-                        PWM_MAIN.goto('dashboard?showThreadDetails=true');
+                        PWM_MAIN.gotoUrl('dashboard?showThreadDetails=true');
                     }})
             });
             <% for (final AppDashboardData.ServiceData loopService : appDashboardData.getServices()) { %>

webapp/src/main/webapp/WEB-INF/jsp/configguide-database.jsp

@@ -215,7 +215,7 @@
             uploadOptions['url'] = 'config-guide?processAction=uploadJDBCDriver';
             uploadOptions['title'] = 'Upload JDBC Driver';
             uploadOptions['nextFunction'] = function() {
-                PWM_MAIN.goto('config-guide');
+                PWM_MAIN.gotoUrl('config-guide');
             };
             PWM_MAIN.IdleTimeoutHandler.cancelCountDownTimer();
             UILibrary.uploadFileDialog(uploadOptions);

webapp/src/main/webapp/WEB-INF/jsp/init.jsp

@@ -61,7 +61,7 @@
     <script type="text/javascript">
         PWM_GLOBAL['startupFunctions'].push(function(){
             PWM_MAIN.preloadAll(function(){
-                PWM_MAIN.goto('<%=StringUtil.escapeJS(nextURL)%>');
+                PWM_MAIN.gotoUrl('<%=StringUtil.escapeJS(nextURL)%>');
             });
         });
     </script>

webapp/src/main/webapp/public/resources/js/admin.js

@@ -34,28 +34,28 @@ PWM_ADMIN.initAdminNavMenu = function() {
                     label: PWM_ADMIN.showString('Title_LogViewer'),
                     id: 'eventLog_dropitem',
                     onClick: function() {
-                        PWM_MAIN.goto(PWM_GLOBAL['url-context'] + '/private/admin/logs');
+                        PWM_MAIN.gotoUrl(PWM_GLOBAL['url-context'] + '/private/admin/logs');
                     }
                 }));
                 pMenu.addChild(new MenuItem({
                     label: PWM_ADMIN.showString('Title_TokenLookup'),
                     id: 'tokenLookup_dropitem',
                     onClick: function() {
-                        PWM_MAIN.goto(PWM_GLOBAL['url-context'] + '/private/admin/tokens');
+                        PWM_MAIN.gotoUrl(PWM_GLOBAL['url-context'] + '/private/admin/tokens');
                     }
                 }));
                 pMenu.addChild(new MenuItem({
                     label: PWM_ADMIN.showString('Title_URLReference'),
                     id: 'urlReference_dropitem',
                     onClick: function() {
-                        PWM_MAIN.goto(PWM_GLOBAL['url-context'] + '/private/admin/urls');
+                        PWM_MAIN.gotoUrl(PWM_GLOBAL['url-context'] + '/private/admin/urls');
                     }
                 }));
                 pMenu.addChild(new MenuItem({
                     label: 'User Debug',
                     id: 'userDebug_dropitem',
                     onClick: function() {
-                        PWM_MAIN.goto(PWM_GLOBAL['url-context'] + '/private/admin/userdebug');
+                        PWM_MAIN.gotoUrl(PWM_GLOBAL['url-context'] + '/private/admin/userdebug');
                     }
                 }));
                 pMenu.addChild(new MenuSeparator());
@@ -63,7 +63,7 @@ PWM_ADMIN.initAdminNavMenu = function() {
                     label: 'Full Page Health Status',
                     id: 'fullPageHealthStatus_dropitem',
                     onClick: function() {
-                        PWM_MAIN.goto(PWM_GLOBAL['url-context'] + '/public/health.jsp');
+                        PWM_MAIN.gotoUrl(PWM_GLOBAL['url-context'] + '/public/health.jsp');
                     }
                 }));
                 pMenu.addChild(new MenuSeparator());
@@ -88,14 +88,14 @@ PWM_ADMIN.initAdminNavMenu = function() {
                     label: 'Configuration Manager',
                     id: 'configurationManager_dropitem',
                     onClick: function() {
-                        PWM_MAIN.goto(PWM_GLOBAL['url-context'] + '/private/config/manager');
+                        PWM_MAIN.gotoUrl(PWM_GLOBAL['url-context'] + '/private/config/manager');
                     }
                 }));
                 pMenu.addChild(new MenuItem({
                     label: 'Configuration Editor',
                     id: 'configurationEditor_dropitem',
                     onClick: function() {
-                        PWM_MAIN.goto(PWM_GLOBAL['url-context'] + '/private/config/editor');
+                        PWM_MAIN.gotoUrl(PWM_GLOBAL['url-context'] + '/private/config/editor');
                     }
                 }));
 

webapp/src/main/webapp/public/resources/js/changepassword.js

@@ -490,7 +490,7 @@ PWM_CHANGEPW.refreshCreateStatus=function(refreshInterval) {
             }
 
             if (data['data']['complete'] === true) {
-                PWM_MAIN.goto(completedUrl,{delay:1000})
+                PWM_MAIN.gotoUrl(completedUrl,{delay:1000})
             } else {
                 setTimeout(function(){
                     PWM_CHANGEPW.refreshCreateStatus(refreshInterval);

webapp/src/main/webapp/public/resources/js/configeditor-settings-challenges.js

@@ -247,7 +247,7 @@ ChallengeSettingHandler.editLocale = function(keyName, localeKey) {
                 };
                 var okAction = function() {
                     switchAllValues(settingType,PWM_VAR['tempValue']);
-                    delete 'tempValue' in PWM_VAR;
+                    PWM_MAIN.JSLibrary.removeFromArray(PWM_VAR, 'tempValue');
                     ChallengeSettingHandler.editLocale(keyName, localeKey);
                 };
                 PWM_MAIN.showConfirmDialog({text:dialogText,loadFunction:loadFunction, okAction:okAction});

webapp/src/main/webapp/public/resources/js/configeditor-settings.js

@@ -327,7 +327,7 @@ StringArrayValueHandler.drawRow = function(settingKey, iteration, value, itemCou
                     if (data['error']) {
                         PWM_MAIN.showErrorDialog(data);
                     } else {
-                        PWM_MAIN.goto('editor');
+                        PWM_MAIN.gotoUrl('editor');
                     }
                 };
                 PWM_MAIN.showWaitDialog({loadFunction:function(){
@@ -416,7 +416,7 @@ StringArrayValueHandler.writeSetting = function(settingKey, reload) {
     var syntax = PWM_SETTINGS['settings'][settingKey]['syntax'];
     var nextFunction = function() {
         if (syntax === 'PROFILE') {
-            PWM_MAIN.goto('editor');
+            PWM_MAIN.gotoUrl('editor');
         }
         if (reload) {
             StringArrayValueHandler.init(settingKey);

webapp/src/main/webapp/public/resources/js/configeditor.js

@@ -552,17 +552,17 @@ PWM_CFGEDIT.gotoSetting = function(category,settingKey,profile) {
     }
 
     if (!settingKey && !category) {
-        console.log('unable to goto setting: settingKey and category parameter are not specified');
+        console.log('unable to gotoUrl setting: settingKey and category parameter are not specified');
         return;
     }
 
     if (settingKey && !(settingKey in PWM_SETTINGS['settings'])) {
-        console.log('unable to goto setting: settingKey parameter "' + settingKey + '" is not valid');
+        console.log('unable to gotoUrl setting: settingKey parameter "' + settingKey + '" is not valid');
         return;
     }
 
     if (!(category in PWM_SETTINGS['categories'])) {
-        console.log('unable to goto setting: category parameter "' + category + '" is not valid');
+        console.log('unable to gotoUrl setting: category parameter "' + category + '" is not valid');
         return;
     }
 
@@ -620,13 +620,13 @@ PWM_CFGEDIT.cancelEditing = function() {
                                 function () {
                                     PWM_MAIN.showWaitDialog({loadFunction: function () {
                                             PWM_MAIN.ajaxRequest('editor?processAction=cancelEditing',function(){
-                                                PWM_MAIN.goto('manager', {addFormID: true});
+                                                PWM_MAIN.gotoUrl('manager', {addFormID: true});
                                             });
                                         }});
                                 }
                         });
                     } else {
-                        PWM_MAIN.goto('manager', {addFormID: true});
+                        PWM_MAIN.gotoUrl('manager', {addFormID: true});
                     }
                 }
             };
@@ -788,7 +788,7 @@ PWM_CFGEDIT.selectTemplate = function(newTemplate) {
         okAction: function () {
             PWM_MAIN.showWaitDialog({loadFunction: function () {
                     var url = "editor?processAction=setOption&template=" + newTemplate;
-                    PWM_MAIN.ajaxRequest(url, function(){ PWM_MAIN.goto('editor'); });
+                    PWM_MAIN.ajaxRequest(url, function(){ PWM_MAIN.gotoUrl('editor'); });
                 }});
         }
     });

webapp/src/main/webapp/public/resources/js/configguide.js

@@ -82,7 +82,7 @@ PWM_GUIDE.gotoStep = function(step) {
                         return;
                     }
                 }
-                PWM_MAIN.goto('config-guide');
+                PWM_MAIN.gotoUrl('config-guide');
             };
             PWM_MAIN.ajaxRequest(url,loadFunction);
         });

webapp/src/main/webapp/public/resources/js/configmanager.js

@@ -54,7 +54,7 @@ PWM_CONFIG.waitForRestart=function(options) {
     var restartFunction = function() {
         var redirectUrl = 'location' in options ? options['location'] : '/';
         console.log("application appears to be restarted, redirecting to context url: " + redirectUrl);
-        PWM_MAIN.goto(redirectUrl);
+        PWM_MAIN.gotoUrl(redirectUrl);
     };
 
     options = options === undefined ? {} : options;
@@ -229,7 +229,7 @@ PWM_CONFIG.downloadLocalDB = function () {
         okAction:function(){
             PWM_MAIN.showWaitDialog({
                 loadFunction:function(){
-                    PWM_MAIN.goto('localdb?processAction=exportLocalDB',{addFormID:true,hideDialog:true});
+                    PWM_MAIN.gotoUrl('localdb?processAction=exportLocalDB',{addFormID:true,hideDialog:true});
                     setTimeout(function(){PWM_MAIN.closeWaitDialog()},5000);
                 }
             });
@@ -244,7 +244,7 @@ PWM_CONFIG.downloadConfig = function () {
         okAction:function(){
             PWM_MAIN.showWaitDialog({
                 loadFunction:function(){
-                    PWM_MAIN.goto('ConfigManager?processAction=downloadConfig',{addFormID:true,hideDialog:true});
+                    PWM_MAIN.gotoUrl('ConfigManager?processAction=downloadConfig',{addFormID:true,hideDialog:true});
                     setTimeout(function(){PWM_MAIN.closeWaitDialog()},5000);
                 }
             });
@@ -266,7 +266,7 @@ PWM_CONFIG.downloadSupportBundle = function() {
         okAction:function(){
             PWM_MAIN.showWaitDialog({
                 loadFunction: function () {
-                    PWM_MAIN.goto('ConfigManager?processAction=generateSupportZip', {
+                    PWM_MAIN.gotoUrl('ConfigManager?processAction=generateSupportZip', {
                         addFormID: true,
                         hideDialog: true
                     });
@@ -327,7 +327,7 @@ PWM_CONFIG.heartbeatCheck = function() {
 
 PWM_CONFIG.initConfigHeader = function() {
     PWM_MAIN.addEventHandler('panel-header-healthData','click',function(){
-        PWM_MAIN.goto('/private/config/manager');
+        PWM_MAIN.gotoUrl('/private/config/manager');
     });
     PWM_MAIN.addEventHandler('button-closeHeader','click',function(){
         PWM_CONFIG.closeHeaderWarningPanel();
@@ -340,7 +340,7 @@ PWM_CONFIG.initConfigHeader = function() {
     });
 
     require(["dojo/dom-construct", "dojo/_base/window", "dojo/dom", "dijit/place", "dojo/on"], function(domConstruct, win, dom, place, on){
-        domConstruct.create("div", { id: "header-warning-backdrop", class:"nodisplay" }, win.body());
+        domConstruct.create("div", { id: "header-warning-backdrop", "class":"nodisplay" }, win.body());
 
         PWM_CONFIG.headerResizeListener = on.pausable(window, "resize", function () {
             place.around(dom.byId("header-warning"), dom.byId("header-username-caret"), ["below-alt"], false);
@@ -362,7 +362,7 @@ PWM_CONFIG.initConfigManagerWordlistPage = function() {
         uploadOptions['nextFunction'] = function () {
             PWM_MAIN.showDialog({
                 title: 'Finished', text: 'Upload Completed', okAction: function () {
-                    PWM_MAIN.goto('wordlists');
+                    PWM_MAIN.gotoUrl('wordlists');
                 }
             });
         };
@@ -380,7 +380,7 @@ PWM_CONFIG.initConfigManagerWordlistPage = function() {
                                 text: data['successMessage'], okAction: function () {
                                     PWM_MAIN.showWaitDialog({
                                         loadFunction: function(){
-                                            PWM_MAIN.goto('wordlists');
+                                            PWM_MAIN.gotoUrl('wordlists');
                                         }
                                     });
                                 }

webapp/src/main/webapp/public/resources/js/main.js

@@ -273,7 +273,7 @@ PWM_MAIN.applyFormAttributes = function() {
             PWM_MAIN.addEventHandler(linkElement, "click", function (event) {
                 event.preventDefault();
                 PWM_MAIN.showWaitDialog({loadFunction: function () {
-                        PWM_MAIN.goto(hrefValue);
+                        PWM_MAIN.gotoUrl(hrefValue);
                     }});
             });
             linkElement.removeAttribute('href');
@@ -336,7 +336,7 @@ PWM_MAIN.addEventHandler = function(nodeId,eventType,functionToAdd) {
 };
 
 
-PWM_MAIN.goto = function(url,options) {
+PWM_MAIN.gotoUrl = function(url, options) {
     PWM_VAR['dirtyPageLeaveFlag'] = false;
     options = options === undefined ? {} : options;
     if (!('noContext' in options) && url.indexOf(PWM_GLOBAL['url-context']) !== 0) {
@@ -400,7 +400,7 @@ PWM_MAIN.handleLoginFormSubmit = function(form, event) {
                     console.log('authentication success');
                     var nextURL = data['data']['nextURL'];
                     if (nextURL) {
-                        PWM_MAIN.goto(nextURL, {noContext: true});
+                        PWM_MAIN.gotoUrl(nextURL, {noContext: true});
                     }
                 };
                 PWM_MAIN.ajaxRequest(url,loadFunction,options);
@@ -664,7 +664,7 @@ PWM_MAIN.initLocaleSelectorMenu = function(attachNode) {
                 } else {
                     nextUrl = PWM_MAIN.addParamToUrl(nextUrl, 'locale', localeKey)
                 }
-                PWM_MAIN.goto(nextUrl);
+                PWM_MAIN.gotoUrl(nextUrl);
             });
         });
     });
@@ -711,7 +711,7 @@ PWM_MAIN.showErrorDialog = function(error, options) {
     options['okAction'] =  function() {
         if (forceReload) { // incorrect page sequence;
             var newURL = window.location.pathname;
-            PWM_MAIN.goto(newURL);
+            PWM_MAIN.gotoUrl(newURL);
             PWM_MAIN.showWaitDialog();
         } else {
             previousOkAction();
@@ -1606,7 +1606,7 @@ PWM_MAIN.IdleTimeoutHandler.pollActivity = function() {
             PWM_VAR['dirtyPageLeaveFlag'] = false;
             PWM_GLOBAL['idle_suspendTimeout'] = true;
             var url = PWM_GLOBAL['url-logout'] + '?idle=true&url=' + encodeURIComponent(window.location.pathname);
-            PWM_MAIN.goto(url);
+            PWM_MAIN.gotoUrl(url);
         } else {
             try { PWM_MAIN.getObject('idle_wrapper').style.visibility = 'none'; } catch(e) { /* noop */ }
         }

webapp/src/main/webapp/public/resources/js/newuser.js

@@ -163,7 +163,7 @@ PWM_NEWUSER.refreshCreateStatus=function(refreshInterval) {
             }
 
             if (data['data']['complete'] === true) {
-                PWM_MAIN.goto(completedUrl,{delay:1000})
+                PWM_MAIN.gotoUrl(completedUrl,{delay:1000})
             } else {
                 setTimeout(function(){
                     PWM_NEWUSER.refreshCreateStatus(refreshInterval);

webapp/src/main/webapp/public/resources/js/uilibrary.js

@@ -465,7 +465,7 @@ UILibrary.uploadFileDialog = function(options) {
 
     var nextFunction = 'nextFunction' in options ? options['nextFunction'] : function(data){
         PWM_MAIN.showDialog({title: PWM_MAIN.showString("Title_Success"), text: data['successMessage'],okAction:function(){
-                PWM_MAIN.goto(currentUrl)
+                PWM_MAIN.gotoUrl(currentUrl)
             }});
     };
 

webapp/src/main/webapp/public/resources/js/updateprofile.js

@@ -68,7 +68,7 @@ PWM_UPDATE.uploadPhoto=function(fieldName,options) {
     uploadOptions['nextFunction'] = function () {
         PWM_MAIN.showWaitDialog({
             title: 'Upload complete...', loadFunction: function () {
-                PWM_MAIN.goto(window.location.pathname);
+                PWM_MAIN.gotoUrl(window.location.pathname);
             }
         });
     };