eliminate some nesting and some non-sdumps

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

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 7184501..93e91c5 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js
@@ -3,30 +3,39 @@ sdump('D_TRACE','Loading patron_search.js\n');
 var test_variable = false;
 
 function patron_search_init(p) {
-       dump("TESTING: patron_search.js: " + mw.G['main_test_variable'] + '\n');
+       sdump('D_PATRON_SEARCH',"TESTING: patron_search.js: " + mw.G['main_test_variable'] + '\n');
 
        var clamshell = spawn_clamshell( 
-               p.w.document, 'new_iframe', p.clamshell, {
+               p.w.document, 'new_iframe', p.clamshell, { 
+                       'onload' : patron_search_init_after_clamshell(p) 
+               }
+       );
+}
+
+function patron_search_init_after_clamshell(p) {
+       sdump('D_PATRON_SEARCH',arg_dump(arguments));
+       return function (clamshell_w) {
+               var form = spawn_patron_search_form(
+                       clamshell_w.document, 
+                       'new_iframe', 
+                       clamshell_w.first_deck, {
+                               'onload' : patron_init_after_patron_search_form(p)
+                       }
+               );
 
-                       'onload' : function (w) {
-                               var form = spawn_patron_search_form(
-                                       w.document, 
-                                       'new_iframe', 
-                                       w.first_deck, {
-                                               'onload' : function(w2) {
-                                                       w2.register_search_callback(
-                                                               function (ev) {
-                                                                       alert('Submitted: ' + 
-                                                                               js2JSON(form.crazy_search_hash) + '\n');
-                                                                       test_variable = true; });
+               clamshell_w.new_card_in_second_deck(
+                       'chrome://evergreen/content/main/about.xul', {}); 
+       };
+}
 
-                                                       w.new_card_in_second_deck(
-                                                               'chrome://evergreen/content/main/about.xul', {}); 
-                                               }
-                                       }
-                               );
-       
+function patron_init_after_patron_search_form(p) {
+       sdump('D_PATRON_SEARCH',arg_dump(arguments));
+       return function(form_w) {
+               form_w.register_search_callback(
+                       function (ev) {
+                               alert('Submitted: ' + 
+                                       js2JSON(form_w.crazy_search_hash) + '\n');
                        }
-               }
-       );
+               );
+       };
 }

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 08382c4..72aec03 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
@@ -1,9 +1,7 @@
 sdump('D_TRACE','Loading patron_search_form.js\n');
 
 function patron_search_form_init(p) {
-       dump("TESTING: patron_search_form.js: " + mw.G['main_test_variable'] + '\n');
-       dump('p.w          = ' + p.w + '\n');
-       dump('p.w.document = ' + p.w.document + '\n');
+       sdump('D_PATRON_SEARCH_FORM',"TESTING: patron_search_form.js: " + mw.G['main_test_variable'] + '\n');
        p.w.crazy_search_hash = {}; // hash[ field ] = { 'value' : ???, 'group' : ??? }
 
        var nl = p.w.document.getElementsByTagName('textbox');
@@ -32,14 +30,14 @@ function patron_search_form_init(p) {
                                p.w.crazy_search_hash = {}; },
                        false);
        else
-               dump("No cmd_clear element.\n");
+               sdump('D_PATRON_SEARCH_FORM',"No cmd_clear element.\n");
 
        if (p.onload) {
                try {
-                       dump('D_TRACE','trying psuedo-onload...\n');
+                       sdump('D_TRACE','trying psuedo-onload...\n');
                        p.onload(p.w);
                } catch(E) {
-                       dump( js2JSON(E) + '\n' );
+                       sdump('D_ERROR', js2JSON(E) + '\n' );
                }
        }