I broke the New Window button on the login screen when moving the menu system to...

git-svn-id: svn://svn.open-ils.org/ILS/branches/staff-client-experiment@12212 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.js b/Open-ILS/xul/staff_client/chrome/content/main/main.js
index 7eefcaf..e6f018e 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.js
@@ -1,6 +1,7 @@
 dump('entering main/main.js\n');
 // vim:noet:sw=4:ts=4:
 
+var xulG;
 var offlineStrings;
 var authStrings;
 
@@ -148,7 +149,7 @@ function main_init() {
 
                        grant_perms(url);
 
-                       var xulG = {
+                       xulG = {
                                'auth' : G.auth,
                                'url' : url,
                                'window' : G.window,
@@ -162,6 +163,7 @@ function main_init() {
                                var iframe = document.createElement('iframe'); deck.appendChild(iframe);
                                iframe.setAttribute( 'src', url + '/xul/server/main/data.xul' );
                                iframe.contentWindow.xulG = xulG;
+                G.data_xul = iframe.contentWindow;
                        } else {
                                xulG.file = G.file;
                                var deck = G.auth.controller.view.ws_deck;
@@ -316,9 +318,13 @@ function main_init() {
                        function() {
                                if (G.data.session) {
                                        try {
-                                               G.window.open('chrome://open_ils_staff_client/content/main/menu_frame.xul?server=' +
-                                                       G.data.server,'main','chrome,resizable' );
-
+                                               //G.data_xul.g.open_menu();
+                        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                        var mframe = xulG.window.open(G.data.server + urls.XUL_MENU_FRAME
+                            + '?server='+window.escape(G.data.server),
+                            'main'+xulG.window.window_name_increment(),'chrome,resizable'
+                        );
+                        mframe.xulG = xulG; 
                                        } catch(E) { alert(E); }
                                } else {
                                        alert ( offlineStrings.getString('main.new_window_btn.login_first_warning') );

diff --git a/Open-ILS/xul/staff_client/server/main/data.xul b/Open-ILS/xul/staff_client/server/main/data.xul
index fc2919e..3b128e4 100644 (file)
--- a/Open-ILS/xul/staff_client/server/main/data.xul
+++ b/Open-ILS/xul/staff_client/server/main/data.xul
@@ -220,17 +220,25 @@
 
                     document.getElementById('caption').setAttribute('label', document.getElementById('commonStrings').getString('staff.main.data.loaded'));
 
+                    g.open_menu();
+
+                } catch(E) {
+                    alert(E);
+                }
+                       }
+
+            g.open_menu = function() {
+                try {
                                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
                     var mframe = xulG.window.open(urls.XUL_MENU_FRAME
                         + '?server='+window.escape(xulG.url),
                         'main'+xulG.window.window_name_increment(),'chrome,resizable'
                     );
                     mframe.xulG = xulG; // This is the xulG from main.js, with auth, url, and window
-
                 } catch(E) {
                     alert(E);
                 }
-                       }
+            }
 
                        g.data.init();