From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 20 Jun 2005 15:46:32 +0000 (+0000)
Subject: put this guy with the others
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=025e290d249b8fde9e8ce6c948dfbcd185e670b1;p=Evergreen.git

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 6e5167923c..e29e966970 100644
--- 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 e1e185199f..46a395c093 100644
--- 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 4bdaac2989..5b5ebe02c1 100644
--- 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;