refactor

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

diff --git a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree.js b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree.js
index ceaecca..39b4575 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree.js
@@ -84,13 +84,6 @@ function circ_tree_init(p) {
                
        ];
 
-        p.w.tree_win = spawn_paged_tree(
-                p.w.document, 'new_iframe', p.paged_tree, { 
-                       'cols' : p.w.circ_cols,
-                       'onload' : circ_tree_init_after_paged_tree(p) 
-               }
-        );
-
        p.w.register_circ_select_callback = function (f) {
                p.w._circ_select_callback = f;
        }
@@ -107,14 +100,33 @@ function circ_tree_init(p) {
                circ_tree_map_circ_to_cols(p, circ, treeitem);  
        }
 
-        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' );
-                }
-        }
+       setTimeout(
+               function() {
+                       sdump('D_TIMEOUT','***** timeout occured circ_tree.js');
+                       p.w.tree_win = spawn_paged_tree(
+                               p.w.document, 'new_iframe', p.paged_tree, {
+                                       'hide_nav' : true,
+                                       'hits_per_page' : 99999, 
+                                       'cols' : p.w.circ_cols,
+                                       'onload' : circ_tree_init_after_paged_tree(p) 
+                               }
+                       );
+                       setTimeout(
+                               function () {
+                                       sdump('D_TIMEOUT','***** timeout timeout occured circ_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
+                       );
+               }, 0
+       );
+
        sdump('D_TRACE_EXIT',arg_dump(arguments));
        return;
 }
@@ -130,11 +142,16 @@ function circ_tree_init_after_paged_tree(p) {
                tree_win.register_context_builder( p.w._context_function );
                p.w.add_circs = tree_win.add_rows;
                p.w.clear_circs = tree_win.clear_tree;
-               try {
-                       if (p.paged_tree_onload) p.paged_tree_onload(tree_win);
-               } catch(E) {
-                        sdump('D_ERROR', js2JSON(E) + '\n' );
-               }
+               setTimeout(
+                       function() {
+                               sdump('D_TIMEOUT','***** timeout after paged_tree occured circ_tree.js');
+                               try {
+                                       if (p.paged_tree_onload) p.paged_tree_onload(tree_win);
+                               } catch(E) {
+                                       sdump('D_ERROR', js2JSON(E) + '\n' );
+                               }
+                       }, 0
+               );
                sdump('D_TRACE_EXIT',arg_dump(arguments));
                return;
        };

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 2bdfd5b..23cc648 100755 (executable)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
@@ -36,10 +36,10 @@ function patron_display_init(p) {
                        p.w.retrieve_patron_via_barcode( p.patron );
        }
 
-       sdump('D_TRACE','******** SETTING TIMEOUT\n');
+       sdump('D_TIMEOUT','******** SETTING TIMEOUT\n');
        setTimeout( 
                function() {
-                       sdump('D_TRACE','******** TIMEOUT OCCURRED\n');
+                       sdump('D_TIMEOUT','******** timeout occurred in patron_display.js\n');
                        p.w.clamshell = spawn_clamshell( 
                                p.w.document, 'new_iframe', p.clamshell, {
                                        'horizontal' : true,
@@ -49,7 +49,7 @@ function patron_display_init(p) {
                }
                ,0
        );
-       sdump('D_TRACE','******** AFTER SETTING TIMEOUT\n');
+       sdump('D_TIMEOUT','******** AFTER SETTING TIMEOUT\n');
 
        sdump('D_TRACE_EXIT',arg_dump(arguments));
        return;
@@ -60,6 +60,7 @@ function patron_display_init_after_clamshell(p) {
        return function (clamshell_w) {
                setTimeout(
                        function() {
+                               sdump('D_TIMEOUT','******** timeout occurred (1) after clamshell in patron_display.js\n');
                                p.w.inner_clamshell = spawn_clamshell_vertical( 
                                        clamshell_w.document, 
                                        'new_iframe', 
@@ -70,8 +71,10 @@ function patron_display_init_after_clamshell(p) {
                                );
                        }, 0
                );
+               /*
                setTimeout(
                        function() {
+                               sdump('D_TIMEOUT','******** timeout occurred (2) after clamshell in patron_display.js\n');
                                p.w.item_tree = spawn_circ_tree( 
                                        clamshell_w.document, 
                                        'new_iframe', 
@@ -82,6 +85,7 @@ function patron_display_init_after_clamshell(p) {
                                );
                        }, 0
                );
+               */
                return;
        };
 
@@ -105,6 +109,7 @@ function patron_display_init_after_inner_clamshell(p) {
                sdump('D_PATRON_DISPLAY',arg_dump(arguments));
                setTimeout(
                        function() {
+                               sdump('D_TIMEOUT','******** timeout occurred (1) after inner clamshell in patron_display.js\n');
                                p.w.status_w = spawn_patron_display_status(
                                        clamshell_w.document, 
                                        'new_iframe', 
@@ -116,6 +121,7 @@ function patron_display_init_after_inner_clamshell(p) {
                );
                setTimeout(
                        function() {
+                               sdump('D_TIMEOUT','******** timeout occurred (2) after inner clamshell in patron_display.js\n');
                                p.w.contact_w = spawn_patron_display_contact(
                                        clamshell_w.document, 
                                        'new_iframe', 

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_contact.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_contact.js
index a3cd803..1193077 100755 (executable)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_contact.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_contact.js
@@ -22,13 +22,18 @@ function patron_display_contact_init(p) {
                return p.w.display_patron();
        }
 
-       if (p.patron) {
-               if (typeof(p.patron) == 'object') {
-                       p.w.set_patron( p.patron );
-                       p.w.display_patron();
-               } else
-                       p.w.retrieve_patron_via_barcode( p.patron );
-       }
+       setTimeout(
+               function() {
+                       sdump('D_TIMEOUT','******** timeout occurred in patron_display_contact.js\n');
+                       if (p.patron) {
+                               if (typeof(p.patron) == 'object') {
+                                       p.w.set_patron( p.patron );
+                                       p.w.display_patron();
+                               } else
+                                       p.w.retrieve_patron_via_barcode( p.patron );
+                       }
+               }, 0
+       );
 
        sdump('D_TRACE_EXIT',arg_dump(arguments));
        return;

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_status.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_status.js
index a51775f..973f2d7 100755 (executable)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_status.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_status.js
@@ -54,13 +54,18 @@ function patron_display_status_init(p) {
                return p.w.display_patron();
        }
 
-       if (p.patron) {
-               if (typeof(p.patron) == 'object') {
-                       p.w.set_patron( p.patron );
-                       p.w.display_patron();
-               } else
-                       p.w.retrieve_patron_via_barcode( p.patron );
-       }
+       setTimeout(
+               function() {
+                       sdump('D_TIMEOUT','******** timeout occurred in patron_display_status.js\n');
+                       if (p.patron) {
+                               if (typeof(p.patron) == 'object') {
+                                       p.w.set_patron( p.patron );
+                                       p.w.display_patron();
+                               } else
+                                       p.w.retrieve_patron_via_barcode( p.patron );
+                       }
+               }, 0
+       );
 
        sdump('D_TRACE_EXIT',arg_dump(arguments));
        return;

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js
index 41eddb5..cc02467 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js
@@ -6,10 +6,15 @@ function patron_search_init(p) {
        sdump('D_PATRON_SEARCH',"TESTING: patron_search.js: " + mw.G['main_test_variable'] + '\n');
        sdump('D_TRACE_ENTER',arg_dump(arguments));
 
-       var clamshell = spawn_clamshell( 
-               p.w.document, 'new_iframe', p.clamshell, { 
-                       'onload' : patron_search_init_after_clamshell(p) 
-               }
+       setTimeout(
+               function () {
+                       sdump('D_TIMEOUT','******** timeout occurred in patron_search.js\n');
+                       p.w.clamshell = spawn_clamshell( 
+                               p.w.document, 'new_iframe', p.clamshell, { 
+                                       'onload' : patron_search_init_after_clamshell(p) 
+                               }
+                       );
+               }, 0
        );
 
        p.w.crazy_search = function (crazy_search_hash) {
@@ -44,20 +49,29 @@ function patron_search_init_after_clamshell(p) {
        return function (clamshell_w) {
                sdump('D_PATRON_SEARCH',arg_dump(arguments));
                sdump('D_TRACE_ENTER',arg_dump(arguments));
-               p.w.search_form = spawn_patron_search_form(
-                       clamshell_w.document, 
-                       'new_iframe', 
-                       clamshell_w.first_deck, {
-                               'onload' : patron_init_after_patron_search_form(p)
-                       }
+               setTimeout(
+                       function () {
+                               sdump('D_TIMEOUT','******** timeout occurred (1) after clamshell in patron_search.js\n');
+                               p.w.search_form = spawn_patron_search_form(
+                                       clamshell_w.document, 
+                                       'new_iframe', 
+                                       clamshell_w.first_deck, {
+                                               'onload' : patron_init_after_patron_search_form(p)
+                                       }
+                               );
+                       }, 0
                );
-
-               p.w.result_tree = spawn_patron_search_results(
-                       clamshell_w.document, 
-                       'new_iframe', 
-                       clamshell_w.second_deck, {
-                               'onload' : patron_init_after_patron_search_results(p)
-                       }
+               setTimeout(
+                       function () {
+                               sdump('D_TIMEOUT','******** timeout occurred (2) after clamshell in patron_search.js\n');
+                               p.w.result_tree = spawn_patron_search_results(
+                                       clamshell_w.document, 
+                                       'new_iframe', 
+                                       clamshell_w.second_deck, {
+                                               'onload' : patron_init_after_patron_search_results(p)
+                                       }
+                               );
+                       }, 0
                );
                sdump('D_TRACE_EXIT',arg_dump(arguments));
                return;
@@ -83,11 +97,16 @@ function patron_init_after_patron_search_form(p) {
                                }
                        }
                );
-               form_w.status_w = spawn_patron_display_status( 
-                       form_w.document, 
-                       'new_iframe', 
-                       form_w.selection_canvas, 
-                       { 'show_name' : true, 'show_retrieve_button' : true, 'app_shell' : p.w.app_shell } 
+               setTimeout(
+                       function () {
+                               sdump('D_TIMEOUT','******** timeout occurred after patron_search_form in patron_search.js\n');
+                               form_w.status_w = spawn_patron_display_status( 
+                                       form_w.document, 
+                                       'new_iframe', 
+                                       form_w.selection_canvas, 
+                                       { 'show_name' : true, 'show_retrieve_button' : true, 'app_shell' : p.w.app_shell } 
+                               );
+                       }, 1
                );
                sdump('D_TRACE_EXIT',arg_dump(arguments));
                return;

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_form.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_form.js
index 8984590..6e62546 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_form.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_form.js
@@ -34,14 +34,19 @@ function patron_search_form_init(p) {
        else
                sdump('D_PATRON_SEARCH_FORM',"No cmd_clear element.\n");
 
-       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' );
-               }
-       }
+       setTimeout(
+               function() {
+                       sdump('D_TIMEOUT','******** timeout occurred in patron_search_form.js\n');
+                       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
+       );
        return;
 }
 

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_results.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_results.js
index 9dc2d08..078a4bd 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_results.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_results.js
@@ -54,14 +54,19 @@ function patron_search_results_init(p) {
                patron_search_results_map_patron_to_cols(p, patron, treeitem);  
        }
 
-        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' );
-                }
-        }
+       setTimeout(
+               function() {
+                       sdump('D_TIMEOUT','******** timeout occurred in patron_search_results.js\n');
+                       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;
 }