with staff client 3 I won't be pushing around references to main windows

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

diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/volume.js b/Evergreen/staff_client/chrome/content/evergreen/cat/volume.js
index 8caa8ec..0bd5051 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/cat/volume.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/cat/volume.js
@@ -339,7 +339,7 @@ function send_to_bill() {
                        return [ label, copies ]; 
                } 
        );
-       alert( window.app_shell );
+       //alert( window.app_shell );
        try {
                spawn_spine_label_wizard(document,'new_window','',{ 'spine_labels' : spine_labels }); 
        } catch(E) {

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 65d2874..a4e40cd 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js
@@ -44,7 +44,11 @@ function spawn_interface(d,placement,place,chrome,label,passthru_params,clone) {
        }
        w.params = passthru_params;
        w.mw = mw;
-       if (placement == 'new_tab' || placement == 'replace_tab') w.app_shell = d; else w.app_shell = app_shell;
+       if (placement == 'new_tab' || placement == 'replace_tab') {
+               w.app_shell = d;
+       } else {
+               if (typeof app_shell != 'undefined') w.app_shell = app_shell;
+       }
        return w;
 }