inspecting Big G for XUL vars/login session

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

diff --git a/Open-ILS/src/javascript/opac/GlobalInit.js b/Open-ILS/src/javascript/opac/GlobalInit.js
index 4b00979..384be69 100644 (file)
--- a/Open-ILS/src/javascript/opac/GlobalInit.js
+++ b/Open-ILS/src/javascript/opac/GlobalInit.js
@@ -11,9 +11,20 @@ var globalMenuManager                        = null;
 
 var loaded = false;
 
+function isXUL() {
+       try {
+               if(IAMXUL)
+                       return true;
+       } catch(E) {
+               return false;
+       }
+}
+
 
 function globalInit() {
 
+       debug(" --- XUL IS " + isXUL() );
+
        var page_name = globalPageTarget;
 
        if(!page_name) 
@@ -77,6 +88,9 @@ function globalInit() {
        globalPage.init();
        globalPage.setLocDisplay();
        globalPage.locationTree = globalOrgTreeWidget;
+
+       if(globalSearchBarChunk)
+               globalSearchBarChunk.reset();
        
        if( globalSearchBarFormChunk != null)
                globalSearchBarFormChunk.resetPage();
@@ -91,7 +105,11 @@ function GlobalInitLoad() {
        globalOrgTreeWidget = new LocationTree(globalOrgTree);
        globalUser = UserSession.instance();
 
-       if(globalUser.verifySession()) {
+       var ses = null;
+       if(isXUL()) 
+               ses = G['auth_ses'][0]; /* G is shoved in by XUL */
+
+       if(globalUser.verifySession(ses)) {
                globalUser.grabOrgUnit();
 
        } else  {