interesting, an accesskey firing off two widgets at once? prevent alt+o, alt+c, alt...

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

diff --git a/Open-ILS/xul/staff_client/server/patron/display.js b/Open-ILS/xul/staff_client/server/patron/display.js
index a32b46b..fb9b84b 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/display.js
+++ b/Open-ILS/xul/staff_client/server/patron/display.js
@@ -277,8 +277,6 @@ patron.display.prototype = {
                                        'cmd_patron_info' : [
                                                ['command'],
                                                function(ev) {
-                            try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_info" ) ); } catch(E) {};
-                                                       obj.reset_nav_styling('cmd_patron_info');
                                                        obj.right_deck.set_iframe(
                                                                urls.XUL_PATRON_INFO, // + '?patron_id=' + window.escape( obj.patron.id() ),
                                                                {},
@@ -453,7 +451,6 @@ patron.display.prototype = {
                        obj.controller.view.cmd_patron_holds.setAttribute('disabled','true');
                        obj.controller.view.cmd_patron_bills.setAttribute('disabled','true');
                        obj.controller.view.cmd_patron_edit.setAttribute('disabled','true');
-                       obj.controller.view.cmd_patron_info.setAttribute('disabled','true');
                        obj.controller.view.patron_name.setAttribute('value', $("patronStrings").getString('staff.patron.display.init.retrieving'));
                        document.documentElement.setAttribute('class','');
                        var frame = obj.left_deck.set_iframe(
@@ -474,7 +471,6 @@ patron.display.prototype = {
                                                obj.controller.view.cmd_patron_holds.setAttribute('disabled','false');
                                                obj.controller.view.cmd_patron_bills.setAttribute('disabled','false');
                                                obj.controller.view.cmd_patron_edit.setAttribute('disabled','false');
-                                               obj.controller.view.cmd_patron_info.setAttribute('disabled','false');
 
                                                if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
                                                        try { 

diff --git a/Open-ILS/xul/staff_client/server/patron/display_overlay.xul b/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
index 6c0395f..4fd6979 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
@@ -90,7 +90,7 @@
                             <button id="PatronNavBar_other" command="cmd_patron_other" class="nav" label="&staff.patron_navbar.other;" accesskey="&staff.patron_navbar.other.accesskey;" type="menu">
                                 <menupopup>
                                     <menuitem label="&staff.patron_navbar.alert;" accesskey="&staff.patron_navbar.alert.accesskey;" command="cmd_patron_alert"/>
-                                    <menuitem label="&staff.patron_navbar.info;" accesskey="&staff.patron_navbar.info.accesskey;" command="cmd_patron_info"/>
+                                    <menuitem label="&staff.patron_navbar.info;" conflicting_accesskey="&staff.patron_navbar.info.accesskey;" command="cmd_patron_info"/>
                                     <menuitem label="&staff.patron_display.verify_password.label;" accesskey="&staff.patron_display.verify_password.accesskey;" command="cmd_verify_credentials"/>
                                     <menuitem label="&staff.main.menu.admin.user_edit.label;" accesskey="&staff.main.menu.admin.user_edit.accesskey;" command="cmd_perm_editor"/>
                                     <menuitem label="&staff.patron_navbar.actions.menu.standing_penalties.label;" accesskey="&staff.patron_navbar.actions.menu.standing_penalties.accesskey;"