From d0066841479e925235138a2bbb22e85c05a84785 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sat, 22 Dec 2018 12:28:19 -0700 Subject: [PATCH] Fix bug where account switching failed to actually switch accounts --- nbproject/build.xml | 100 +++++++++++++++++------------------ nbproject/project.properties | 8 +-- www/js/accounts.js | 6 +-- www/pages/accounts.html | 2 +- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/nbproject/build.xml b/nbproject/build.xml index a1e4d80..cb34933 100644 --- a/nbproject/build.xml +++ b/nbproject/build.xml @@ -46,7 +46,7 @@ made subject to such option by the copyright holder. - + @@ -59,7 +59,7 @@ made subject to such option by the copyright holder. } ]]> - + - + @@ -85,8 +85,8 @@ made subject to such option by the copyright holder. - - + + @@ -106,8 +106,8 @@ made subject to such option by the copyright holder. - - + + @@ -117,26 +117,26 @@ made subject to such option by the copyright holder. - - - - - + + - + - + @@ -144,27 +144,27 @@ made subject to such option by the copyright holder. - + - - + + - + - - + + @@ -178,23 +178,23 @@ made subject to such option by the copyright holder. - + - + - + - + - + @@ -208,15 +208,15 @@ made subject to such option by the copyright holder. - + - + - Install "${basedir}/platforms/ios/build/${project.name}.ipa" through iTunes and run it. - + Install "${basedir}/platforms/ios/build/${project.name}.ipa" through iTunes and run it. + @@ -228,13 +228,13 @@ made subject to such option by the copyright holder. - + - + - - + + @@ -244,9 +244,9 @@ made subject to such option by the copyright holder. - - - + + + @@ -255,21 +255,21 @@ made subject to such option by the copyright holder. - - - - + + + + - - - + + + - - + + @@ -277,16 +277,16 @@ made subject to such option by the copyright holder. - + - + - + diff --git a/nbproject/project.properties b/nbproject/project.properties index 8445b59..c6bff52 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,8 +1,8 @@ auxiliary.org-netbeans-modules-cordova.cordova_5f_build_5f_script_5f_version=52 auxiliary.org-netbeans-modules-cordova.phonegap=false -file.reference.BusinessMobile-test=test -file.reference.BusinessMobile-www=www +file.reference.NetsymsMobile-test=test +file.reference.NetsymsMobile-www=www files.encoding=UTF-8 project.licensePath=nbproject/mplheader.txt -site.root.folder=${file.reference.BusinessMobile-www} -test.folder=${file.reference.BusinessMobile-test} +site.root.folder=${file.reference.NetsymsMobile-www} +test.folder=${file.reference.NetsymsMobile-test} diff --git a/www/js/accounts.js b/www/js/accounts.js index d04f2c4..2f3f5fe 100644 --- a/www/js/accounts.js +++ b/www/js/accounts.js @@ -49,14 +49,14 @@ function recoveraccounts(callback) { /** * Switch to a different account. * @param {int} account The selected account index from localStorage.getItem('accounts') - * @param {boolean} showmsg Whether to show the "switched accounts" alert dialog. Default True. + * @param {boolean} showmsg [HAS NO EFFECT] Whether to show the "switched accounts" alert dialog. Default True. * @returns {undefined} */ function switchaccount(account, showmsg) { if (typeof showmsg != 'boolean') { showmsg = true; } - // If there isn't an accounts list yet, this shouldi take us back to the setup + // If there isn't an accounts list yet, this should take us back to the setup if (!isconfigvalid()) { restartApplication(); } @@ -74,7 +74,7 @@ function switchaccount(account, showmsg) { restartApplication(); if (showmsg == true) { - navigator.notification.alert("Successfully switched accounts.", null, "Switched", 'OK'); + //navigator.notification.alert("Successfully switched accounts.", null, "Switched", 'OK'); } } diff --git a/www/pages/accounts.html b/www/pages/accounts.html index 6fb3248..b9b54f4 100644 --- a/www/pages/accounts.html +++ b/www/pages/accounts.html @@ -21,7 +21,7 @@
    {{#each accounts}}
  • -
    +