From: phasefx Date: Thu, 14 Jul 2005 19:32:00 +0000 (+0000) Subject: going back to heavy overlay use instead of nested iframes (and timeouts). windows... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=849005edbb89fde44291f54460e0ca6dd3df2d68;p=Evergreen.git going back to heavy overlay use instead of nested iframes (and timeouts). windows are no longer being treated as objects, and instead objects get constructed with references to DOM nodes. set_decks is broken. fconsole is a resource hog. universal containers for xul commands and popups git-svn-id: svn://svn.open-ils.org/ILS/trunk@1188 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Evergreen/staff_client/Makefile b/Evergreen/staff_client/Makefile index abec3fe69b..3448169ad5 100644 --- a/Evergreen/staff_client/Makefile +++ b/Evergreen/staff_client/Makefile @@ -22,12 +22,16 @@ open-ils: cp ../../Open-ILS/src/javascript/widgets/*.js chrome/content/evergreen/Open-ILS/widgets/ cp ../../Open-ILS/src/javascript/widgets/menu/*.js chrome/content/evergreen/Open-ILS/widgets/menu/ +patron: + (cat chrome/content/evergreen/main/paged_tree_overlay.xul | sed s/paged_tree/patron_items/g | sed s/PagedTree/PatronItems/g > chrome/content/evergreen/patron/patron_items_overlay.xul ) + (cp chrome/locale/en-US/evergreen/paged_tree.dtd chrome/locale/en-US/evergreen/patron_items.dtd) + evergreen.xpi: evergreen.jar @echo @echo make the xpi file zip -r evergreen.xpi chrome/ defaults/ install.js install.rdf Makefile LICENSE README -x \*CVS\* > /dev/null -evergreen.jar: generated open-ils +evergreen.jar: generated open-ils patron @echo @echo make the jar file (cd chrome; zip -r evergreen.jar content/ locale/ skin/ -x \*CVS\* > /dev/null ) @@ -37,6 +41,7 @@ clean: @echo delete derived files rm -f evergreen.xpi rm -f chrome/evergreen.jar + rm -f chrome/content/evergreen/patron/patron_items_overlay.xml chrome/locale/en-US/evergreen/patron_items.dtd rm -f chrome/content/evergreen/conf/client_config.xml rm -f chrome/content/evergreen/util/fieldmapper.js rm -f chrome/content/evergreen/util/OrgTree.js diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js index aac82ce691..c165c4ed77 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js +++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js @@ -15,6 +15,7 @@ function OpenILS_init(params) { case 'PatronDisplay' : patron_display_init(params); break; case 'PatronDisplayStatus' : patron_display_status_init(params); break; case 'PatronDisplayContact' : patron_display_contact_init(params); break; + case 'PatronItems' : patron_items_init(params); break; case 'CircTree' : circ_tree_init(params); break; } @@ -47,6 +48,7 @@ function OpenILS_exit(params) { case 'PatronDisplay' : patron_display_exit(params); break; case 'PatronDisplayStatus' : patron_display_status_exit(params); break; case 'PatronDisplayContact' : patron_display_contact_exit(params); break; + case 'PatronItems' : patron_items_exit(params); break; case 'CircTree' : circ_tree_exit(params); break; } diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul index 73ea07980a..088cabe059 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul @@ -18,6 +18,7 @@ - + diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul index cd83977858..0be2c362ec 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul @@ -22,7 +22,7 @@ - + @@ -30,5 +30,7 @@ + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul index 89db78e164..d84868eeeb 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul @@ -7,7 +7,7 @@ - + @@ -67,7 +67,7 @@ mw.spawn_filter_console(document,'new_tab','main_tabbox',{}); "/> + mw.spawn_patron_display(document,'new_tab','main_tabbox',{'patron':'21099000006699'}); "/> diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell.js b/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell.js index 871162f79e..6ca106375b 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell.js +++ b/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell.js @@ -2,86 +2,83 @@ sdump('D_TRACE','Loading clam_shell.js\n'); function clam_shell_init(p) { sdump('D_CLAM',"TESTING: clam_shell.js: " + mw.G['main_test_variable'] + '\n'); - p.w.clamshell = get_widget(p.w.document,p.clamshell); + sdump('D_CONSTRUCTOR',arg_dump(arguments)); + if (p) { + // This code breaks the splitter, so don't use if (p.horizontal) { sdump('D_CLAM','Setting horizontal\n'); - p.w.clamshell.orient = 'horizontal'; + p.node.orient = 'horizontal'; } else if (p.vertical) { sdump('D_CLAM','Setting vertical\n'); - p.w.clamshell.orient = 'vertical'; + p.node.orient = 'vertical'; } - p.w.splitter = get_widget( p.w.document, p.splitter ); + + p.splitter_node = p.node.childNodes[1]; if (p.hide_splitter) { sdump('D_CLAM','Hiding splitter\n'); - p.w.splitter.hidden = true; + p.splitter_node.hidden = true; } else { sdump('D_CLAM','Showing splitter\n'); - p.w.splitter.hidden = false; + p.splitter_node.hidden = false; } } - var nl = p.w.clamshell.getElementsByTagName('deck'); - var first_deck = nl[0]; - var second_deck = nl[1]; - p.w.first_deck = first_deck; - p.w.second_deck = second_deck; - p.w.get_card_in_first_deck = function (idx) { + p.first_deck = p.node.firstChild; + p.second_deck = p.node.lastChild; + + p.get_card_in_first_deck = function (idx) { if (idx) return first_deck.childNodes[ idx ]; else return first_deck.selectedPanel; } - p.w.get_card_in_second_deck = function (idx) { + + p.get_card_in_second_deck = function (idx) { if (idx) return second_deck.childNodes[ idx ]; else return second_deck.selectedPanel; } - p.w.set_first_deck = function (idx) { return set_deck(p.w.document,first_deck,idx); }; - p.w.set_second_deck = function (idx) { return set_deck(p.w.document,second_deck,idx); }; - p.w.replace_card_in_first_deck = function (idx,chrome,params) { - return replace_card_in_deck(p.w.document,first_deck,idx,chrome,params); + + p.set_first_deck = function (idx) { return p.first_deck.selectedIndex = idx; }; + + p.set_second_deck = function (idx) { return p.second_deck.selectedIndex = idx; }; + + p.replace_card_in_first_deck = function (idx,chrome,params) { + return replace_card_in_deck(p.first_deck,idx,chrome,params); }; - p.w.replace_card_in_second_deck = function (idx,chrome,params) { - return replace_card_in_deck(p.w.document,second_deck,idx,chrome,params); + + p.replace_card_in_second_deck = function (idx,chrome,params) { + return replace_card_in_deck(p.second_deck,idx,chrome,params); }; - p.w.new_card_in_first_deck = function (chrome,params) { - return new_card_in_deck(p.w.document,first_deck,chrome,params); + + p.new_card_in_first_deck = function (chrome,params) { + return new_card_in_deck(p.first_deck,chrome,params); }; - p.w.new_card_in_second_deck = function (chrome,params) { - return new_card_in_deck(p.w.document,second_deck,chrome,params); + p.new_card_in_second_deck = function (chrome,params) { + return new_card_in_deck(p.second_deck,chrome,params); }; - if (p.onload) { - try { - sdump('D_TRACE','trying psuedo-onload: ' + p.onload + '\n'); - p.onload(p.w); - } catch(E) { - sdump('D_ERROR', js2JSON(E) + '\n' ); - } - } - - return; + return p; } -function new_card_in_deck(doc,deck,chrome,params) { +function new_card_in_deck(deck,chrome,params) { sdump('D_CLAM',arg_dump(arguments)); - deck = get_widget(doc,deck); - var new_card = document.createElement('iframe'); + var new_card = deck.ownerDocument.createElement('iframe'); deck.appendChild(new_card); new_card.setAttribute('flex','1'); new_card.setAttribute('src',chrome); new_card.setAttribute('id','card_'+(deck.childNodes.length-1)); + new_card.contentWindow.mw = mw; return new_card.contentWindow; } -function replace_card_in_deck(doc,deck,idx,chrome,params) { +function replace_card_in_deck(deck,idx,chrome,params) { sdump('D_CLAM',arg_dump(arguments)); - deck = get_widget(doc,deck); var old_card = deck.childNodes[ idx ]; - var new_card = document.createElement('iframe'); + var new_card = deck.ownerDocument.createElement('iframe'); new_card.setAttribute('flex','1'); new_card.setAttribute('src',chrome); deck.appendChild(new_card); @@ -92,3 +89,4 @@ function replace_card_in_deck(doc,deck,idx,chrome,params) { new_card.contentWindow.params = params; return new_card.contentWindow; } + diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell.xul b/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell.xul index b930bf1599..1745ff08dd 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell.xul @@ -7,8 +7,7 @@ - + @@ -34,5 +33,7 @@ + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_overlay.xul index 8ec87654eb..05ad21e010 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_overlay.xul @@ -5,7 +5,7 @@ - + diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_vertical.xul b/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_vertical.xul index 3d6bd3fa26..4d5c2b2c73 100755 --- a/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_vertical.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_vertical.xul @@ -26,7 +26,7 @@ - + @@ -34,5 +34,7 @@ + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_vertical_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_vertical_overlay.xul index dbbb1cbf21..a55b9d6d13 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_vertical_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_vertical_overlay.xul @@ -5,7 +5,7 @@ - + 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 57fa3a2d2e..40326d4bb0 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js +++ b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js @@ -2,35 +2,69 @@ sdump('D_TRACE','Loading paged_tree.js\n'); function paged_tree_init(p) { sdump('D_PAGED_TREE',"TESTING: paged_tree.js: " + mw.G['main_test_variable'] + '\n'); - sdump('D_TRACE_ENTER',arg_dump(arguments)); + sdump('D_CONSTRUCTOR',arg_dump(arguments)); - p.w.current_idx = 0; + p.current_idx = 0; - p.w.results_label = get_widget( p.w.document, p.nav_results ); - p.w.range_label = get_widget( p.w.document, p.nav_range ); + p.tree = p.node.getElementsByAttribute('name','tree')[0]; + p.popup = p.popupset_node.getElementsByAttribute('name','tree')[0]; + p.treecols = p.tree.firstChild; + p.tc = p.tree.lastChild; - p.w.hits_per_page_menu = get_widget( p.w.document, p.nav_hits_per_page ); - if (p.hits_per_page) - p.w.display_count = parseInt( p.hits_per_page ); - else - p.w.display_count = parseInt( p.w.hits_per_page_menu.getAttribute('value') ); + p._context_function = function (ev) {}; + p.popup.addEventListener('popupshowing',function (ev) { return p._context_function(ev); },false); - p.w.next_button = get_widget( p.w.document, p.nav_next ); - p.w.prev_button = get_widget( p.w.document, p.nav_prev ); + p._select_callback = function (ev) {}; + p.tree.addEventListener('select',function (ev) { return p._select_callback(ev); },false); - p.w.nav_bar = get_widget( p.w.document, p.nav_bar ); - if (p.hide_nav) p.w.nav_bar.hidden = p.hide_nav; + paged_tree_make_columns( p, p.treecols, p.cols ) - /* - // Doesn't work for some reason - var cmd_set_hits_per_page = get_widget( p.w.document, 'cmd_set_hits_per_page' ); - cmd_set_hits_per_page.addEventListener( + p.clear_tree = function () { + empty_widget( p.w.document, p.tc ); + p.current_idx = 0; + return paged_tree_update_nav(p); + } + + p.add_rows = function (ids) { + return paged_tree_add_rows(p,p.tc,ids); + } + + p.register_flesh_row_function = function (f) { + return p._flesh_row_function = f; + } + + p.register_select_callback = function (f) { + return p._select_callback = f; + } + + p.register_context_builder = function (f) { + return p._context_function = f; + } + + p.map_cols_to_treeitem = map_array_to_treecells_via_treeitem; + + p.nav_bar = p.node.getElementsByAttribute('name','nav')[0]; + if (p.hide_nav) p.nav_bar.hidden = p.hide_nav; + + 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 ); + } else { + p.display_count = parseInt( p.hits_per_page_menu.getAttribute('value') ); + } + p.hits_per_page_menu.addEventListener( 'command', function (ev) { sdump('D_TRACE','In set_hits handler\n'); alert('testing123'); try { - p.w.display_count = parseInt( p.w.hits_per_page_menu.getAttribute('value') ); + p.display_count = parseInt( p.hits_per_page_menu.getAttribute('value') ); paged_tree_update_visibility( p ); paged_tree_update_nav( p ); paged_tree_flesh_records( p ); @@ -41,11 +75,10 @@ function paged_tree_init(p) { }, false ); - */ - p.w.set_hits_per_page = function () { + p.set_hits_per_page = function () { try { - p.w.display_count = parseInt( p.w.hits_per_page_menu.getAttribute('value') ); + p.display_count = parseInt( p.hits_per_page_menu.getAttribute('value') ); paged_tree_update_visibility( p ); paged_tree_update_nav( p ); paged_tree_flesh_records( p ); @@ -54,84 +87,34 @@ function paged_tree_init(p) { } } - var cmd_next = get_widget( p.w.document, 'cmd_next' ); + var cmd_next = p.commandset_node.getElementsByAttribute('id', 'cmd_tree_next' )[0]; cmd_next.addEventListener( 'command', function (ev) { - var backup_select_callback = p.w._select_callback; - p.w._select_callback = function (ev) {}; + var backup_select_callback = p._select_callback; + p._select_callback = function (ev) {}; var result = paged_tree_nav_next(p); - p.w._select_callback = backup_select_callback; + p._select_callback = backup_select_callback; return result; }, false ); - var cmd_prev = get_widget( p.w.document, 'cmd_prev' ); + var cmd_prev = p.commandset_node.getElementsByAttribute('id', 'cmd_tree_prev' )[0]; cmd_prev.addEventListener( 'command', function (ev) { - var backup_select_callback = p.w._select_callback; - p.w._select_callback = function (ev) {}; + var backup_select_callback = p._select_callback; + p._select_callback = function (ev) {}; var result = paged_tree_nav_prev(p); - p.w._select_callback = backup_select_callback; + p._select_callback = backup_select_callback; return result; }, false ); - p.w.tree = get_widget(p.w.document,p.paged_tree); - p.w.popup = get_widget(p.w.document,p.popup); - p.w.treecols = p.w.tree.firstChild; - p.w.tc = p.w.tree.lastChild; - - p.w._context_function = function (ev) {}; - p.w.popup.addEventListener('popupshowing',function (ev) { return p.w._context_function(ev); },false); - - p.w._select_callback = function (ev) {}; - p.w.tree.addEventListener('select',function (ev) { return p.w._select_callback(ev); },false); - - paged_tree_make_columns( p, p.w.treecols, p.cols ) - - p.w.clear_tree = function () { - empty_widget( p.w.document, p.w.tc ); - p.w.current_idx = 0; - return paged_tree_update_nav(p); - } - - p.w.add_rows = function (ids) { - return paged_tree_add_rows(p,p.w.tc,ids); - } - - p.w.register_flesh_row_function = function (f) { - return p.w._flesh_row_function = f; - } - - p.w.register_select_callback = function (f) { - return p.w._select_callback = f; - } - - p.w.register_context_builder = function (f) { - return p.w._context_function = f; - } - - p.w.map_cols_to_treeitem = map_array_to_treecells_via_treeitem; - - setTimeout( - function() { - sdump('D_TIMEOUT','***** timeout occured paged_tree.js'); - if (p.onload) { - try { - sdump('D_TRACE','trying psuedo-onload: ' + p.onload + '\n'); - p.onload(p.w); - } catch(E) { - sdump('D_ERROR', js2JSON(E) + '\n' ); - } - } - }, 0 - ); sdump('D_TRACE_EXIT',arg_dump(arguments)); - return; + return p; } function paged_tree_make_columns( p, treecols, cols ) { @@ -168,7 +151,7 @@ function paged_tree_add_rows( p, tc, ids ) { treeitem.setAttribute( 'id', i+offset+1 ); treeitem.setAttribute( 'record_id', id ); treeitem.setAttribute( 'retrieved', 'false' ); - if ( (i+offset) < (p.w.display_count + p.w.current_idx) ) { + if ( (i+offset) < (p.display_count + p.current_idx) ) { treeitem.setAttribute( 'hidden', 'false' ); } else { treeitem.setAttribute( 'hidden', 'true' ); @@ -178,7 +161,7 @@ function paged_tree_add_rows( p, tc, ids ) { var treerow = d.createElement( 'treerow' ); treeitem.appendChild( treerow ); - for (var j = 0; j < p.w.treecols.childNodes.length; j++) { + for (var j = 0; j < p.treecols.childNodes.length; j++) { var treecell = d.createElement( 'treecell' ); if (j == 0) treecell.setAttribute('label', getString('retrieving.record') ); @@ -196,16 +179,16 @@ function paged_tree_add_rows( p, tc, ids ) { function paged_tree_flesh_record(p,treeitem) { sdump('D_TRACE_ENTER',arg_dump(arguments)); treeitem.setAttribute('retrieved','true'); - if (p.w._flesh_row_function) { - p.w._flesh_row_function( treeitem ); + if (p._flesh_row_function) { + p._flesh_row_function( treeitem ); } sdump('D_TRACE_EXIT',arg_dump(arguments)); } function paged_tree_flesh_records(p) { sdump('D_TRACE_ENTER',arg_dump(arguments)); - for (var i = 0; i < p.w.tc.childNodes.length; i++) { - var treeitem = p.w.tc.childNodes[i]; + for (var i = 0; i < p.tc.childNodes.length; i++) { + var treeitem = p.tc.childNodes[i]; if ( (treeitem.hidden == false) && (treeitem.getAttribute('retrieved')=='false') ) { paged_tree_flesh_record(p,treeitem); } @@ -215,41 +198,41 @@ function paged_tree_flesh_records(p) { function paged_tree_update_nav(p) { sdump('D_TRACE_ENTER',arg_dump(arguments)); - if (p.w.results_label) - p.w.results_label.setAttribute('value', p.w.tc.childNodes.length ); - - var min = p.w.current_idx + 1; - var max = p.w.current_idx + p.w.display_count; - if (max > p.w.tc.childNodes.length) - max = p.w.tc.childNodes.length; - if (p.w.range_label) { + if (p.results_label) + p.results_label.setAttribute('value', p.tc.childNodes.length ); + + var min = p.current_idx + 1; + var max = p.current_idx + p.display_count; + if (max > p.tc.childNodes.length) + max = p.tc.childNodes.length; + if (p.range_label) { if (max > 0) - p.w.range_label.setAttribute('value', min + ' - ' + max ); + p.range_label.setAttribute('value', min + ' - ' + max ); else - p.w.range_label.setAttribute('value', '0 - 0' ); + p.range_label.setAttribute('value', '0 - 0' ); } - if (p.w.next_button) { - if (max < p.w.tc.childNodes.length) - p.w.next_button.disabled = false; + if (p.next_button) { + if (max < p.tc.childNodes.length) + p.next_button.disabled = false; else - p.w.next_button.disabled = true; + p.next_button.disabled = true; } - if (p.w.prev_button) { + if (p.prev_button) { if (min == 1) - p.w.prev_button.disabled = true; + p.prev_button.disabled = true; else - p.w.prev_button.disabled = false; + p.prev_button.disabled = false; } sdump('D_TRACE_EXIT',arg_dump(arguments)); } function paged_tree_update_visibility(p) { sdump('D_TRACE_ENTER',arg_dump(arguments)); - for (var i = 0; i < p.w.tc.childNodes.length; i++) { - var treeitem = p.w.tc.childNodes[i]; - if ( (i >= p.w.current_idx) && (i < (p.w.current_idx+p.w.display_count)) ) + for (var i = 0; i < p.tc.childNodes.length; i++) { + var treeitem = p.tc.childNodes[i]; + if ( (i >= p.current_idx) && (i < (p.current_idx+p.display_count)) ) treeitem.hidden = false; else treeitem.hidden = true; @@ -259,10 +242,10 @@ function paged_tree_update_visibility(p) { function paged_tree_nav_next(p) { sdump('D_TRACE_ENTER',arg_dump(arguments)); - var proposed_idx = p.w.current_idx + p.w.display_count; - if (proposed_idx >= p.w.tc.childNodes.length) - proposed_idx = p.w.tc.childNodes.length - 1; - p.w.current_idx = proposed_idx; + var proposed_idx = p.current_idx + p.display_count; + if (proposed_idx >= p.tc.childNodes.length) + proposed_idx = p.tc.childNodes.length - 1; + p.current_idx = proposed_idx; paged_tree_update_visibility(p); paged_tree_update_nav(p); paged_tree_flesh_records(p); @@ -271,10 +254,10 @@ function paged_tree_nav_next(p) { function paged_tree_nav_prev(p) { sdump('D_TRACE_ENTER',arg_dump(arguments)); - var proposed_idx = p.w.current_idx - p.w.display_count; + var proposed_idx = p.current_idx - p.display_count; if (proposed_idx < 0) proposed_idx = 0; - p.w.current_idx = proposed_idx; + p.current_idx = proposed_idx; paged_tree_update_visibility(p); paged_tree_update_nav(p); paged_tree_flesh_records(p); diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.xul b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.xul index e1e877ef09..7da2f140b2 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.xul @@ -33,16 +33,17 @@ - + - + + 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 ccda1315b8..d417235e45 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree_overlay.xul @@ -5,15 +5,15 @@ - + - + - + - + @@ -22,8 +22,8 @@ - - + + @@ -31,12 +31,12 @@