simplify things by not using commands with "cloned" objects. Might be easier to...

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

diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js
index c12de45..d368d20 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js
@@ -54,9 +54,6 @@ function paged_tree_init(p) {
        p.results_label = p.nav_bar.getElementsByAttribute('name','label_results')[0];
        p.range_label = p.nav_bar.getElementsByAttribute('name','label_range')[0];
 
-       p.next_button = p.nav_bar.getElementsByAttribute('name','button_next')[0];
-       p.prev_button = p.nav_bar.getElementsByAttribute('name','button_prev')[0];
-
        p.hits_per_page_menu = p.nav_bar.getElementsByAttribute('name','hits_per_page')[0];
        if (p.hits_per_page) {
                p.display_count = parseInt( p.hits_per_page );
@@ -80,8 +77,9 @@ function paged_tree_init(p) {
                false
        );
 
-       var cmd_next = p.commandset_node.getElementsByAttribute('id', 'cmd_tree_next' )[0];
-       cmd_next.addEventListener(
+
+       p.next_button = p.nav_bar.getElementsByAttribute('name','button_next')[0];
+       p.next_button.addEventListener(
                'command',
                function (ev) {
                        var backup_select_callback = p._select_callback;
@@ -93,8 +91,8 @@ function paged_tree_init(p) {
                false
        );
 
-       var cmd_prev = p.commandset_node.getElementsByAttribute('id', 'cmd_tree_prev' )[0];
-       cmd_prev.addEventListener(
+       p.prev_button = p.nav_bar.getElementsByAttribute('name','button_prev')[0];
+       p.prev_button.addEventListener(
                'command',
                function (ev) {
                        var backup_select_callback = p._select_callback;

diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree_overlay.xul
index d417235..1410c73 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree_overlay.xul
@@ -7,14 +7,6 @@
 
 <commandset id="universal_cmds">
 
-       <command id="cmd_tree_prev" />
-
-       <command id="cmd_tree_next" />
-
-       <!-- For some reason I can't add an event listener to this and have it fire
-               from the menulist below, so using oncommand instead -->
-       <command id="cmd_tree_set_hits_per_page" />
-
        <command id="cmd_broken" oncommand="
                alert('Not Yet Implemented'); "/>
 
@@ -50,8 +42,8 @@
                        <menuitem id="ptnm9" label="100" value="100" />
                </menupopup>
        </menulist>
-       <button id="PagedTree_button_prev" label="&previous.range;" accesskey="&previous.range.key;" command="cmd_tree_prev" disabled="true" name="button_prev"/>
-       <button id="PagedTree_button_next" label="&next.range;" accesskey="&next.range.key;" command="cmd_tree_next" disabled="true" name="button_next"/>
+       <button id="PagedTree_button_prev" label="&previous.range;" accesskey="&previous.range.key;" disabled="true" name="button_prev"/>
+       <button id="PagedTree_button_next" label="&next.range;" accesskey="&next.range.key;" disabled="true" name="button_next"/>
 </hbox>
 
 <!-- Context menus -->

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
index 34ceafa..618d0e7 100755 (executable)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
@@ -84,7 +84,7 @@ function patron_display_clamshell_init(p) {
 }
 
 function patron_display_patron_items_init(p) {
-       p.patron_items = patron_items_init( { 'w' : p.w, 'node' : p.patron_items_node, 'popupset_node' : p.popupset_node, 'commandset_node' : p.commandset_node, 'debug' : p.app } );
+       p.patron_items = patron_items_init( { 'w' : p.w, 'node' : p.patron_items_node, 'popupset_node' : p.popupset_node, 'debug' : p.app } );
 
        p.redraw_patron_items = function() {
                p.patron_items.clear_patron_items();

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.xul
index b606a59..d475ed4 100755 (executable)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.xul
@@ -11,7 +11,6 @@
                params.app = 'PatronDisplay'; 
                params.clamshell_node = document.getElementById('ClamShell_main');
                params.patron_items_node = document.getElementById('PatronItems_main');
-               params.commandset_node = document.getElementById('universal_cmds');
                params.popupset_node = document.getElementById('universal_popupset');
                mw.focus_widget( document, 'PatronNavBar_refresh' );
                mw.OpenILS_init(params);"

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_items.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_items.js
index 1efeafa..a7f6d46 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_items.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_items.js
@@ -6,7 +6,7 @@ function patron_items_init(p) {
 
        p.patron_items_cols = circ_cols();
 
-       p.paged_tree = paged_tree_init( { 'w' : p.w, 'node' : p.node, 'popupset_node' : p.popupset_node, 'commandset_node' : p.commandset_node, 'cols' : p.patron_items_cols, 'hide_nav' : true, 'hits_per_page' : '9999', 'debug' : p.app } );
+       p.paged_tree = paged_tree_init( { 'w' : p.w, 'node' : p.node, 'popupset_node' : p.popupset_node, 'cmd_next' : p.cmd_next, 'cmd_prev' : p.cmd_prev, 'cols' : p.patron_items_cols, 'hide_nav' : true, 'hits_per_page' : '9999', 'debug' : p.app } );
        p.add_patron_items = p.paged_tree.add_rows;
        p.clear_patron_items = p.paged_tree.clear_tree;