put this guy with the others

git-svn-id: svn://svn.open-ils.org/ILS/trunk@876 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js
index 6e51679..e29e966 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js
@@ -3,6 +3,7 @@ function OpenILS_init(screen) {
 
        switch(screen) {
                case 'auth' : auth_init(); break;
+               case 'app_shell' : app_shell_init(); break;
        }
 
        sdump('D_TRACE','Exiting OpenILS_init\n');

diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js
index e1e1851..46a395c 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js
@@ -354,22 +354,6 @@ function my_actsc_list_callback(request) {
 }
 
 
-function spawn_main() {
-       try {
-               var w = new_window('chrome://evergreen/content/evergreen/main/app_shell.xul');
-               if (!w) { throw('window ref == null'); }
-               try {
-                       w.document.title = mw.G.user.usrname() + '@' + mw.G.user_ou.name();
-               } catch(E) {
-                       alert('Hrmm. ' + pretty_print( js2JSON(E) ) );
-               }
-       } catch(E) {
-               incr_progressmeter('auth_meter',-100);
-               alert('Login failed on new_window: ' + js2JSON(E)); enable_login_prompts(); return;
-       }
-       incr_progressmeter('auth_meter',100);
-}
-
 function logoff() {
        mw.G['auth_ses'] = '';
        close_all_windows();

diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js
index 4bdaac2..5b5ebe0 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js
@@ -1,3 +1,19 @@
+function spawn_main() {
+       try {
+               var w = new_window('chrome://evergreen/content/evergreen/main/app_shell.xul');
+               if (!w) { throw('window ref == null'); }
+               try {
+                       w.document.title = mw.G.user.usrname() + '@' + mw.G.user_ou.name();
+               } catch(E) {
+                       alert('Hrmm. ' + pretty_print( js2JSON(E) ) );
+               }
+       } catch(E) {
+               incr_progressmeter('auth_meter',-100);
+               alert('Login failed on new_window: ' + js2JSON(E)); enable_login_prompts(); return;
+       }
+       incr_progressmeter('auth_meter',100);
+}
+
 function spawn_copy_browser(tab,params) {
        sdump('D_SPAWN','trying to spawn_copy_browser('+js2JSON(params)+')\n');
        var w;