From 5d0ce0acb398aa2b88bebd38bd4376e670d12af9 Mon Sep 17 00:00:00 2001 From: phasefx Date: Tue, 23 Aug 2005 16:45:39 +0000 Subject: [PATCH] clean this up later. Main problem is that I was trying to js2JSON things like chromeWindow git-svn-id: svn://svn.open-ils.org/ILS/trunk@1708 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Evergreen/staff_client/Makefile | 8 ++-- .../content/evergreen/Open-ILS/OpenILS.js | 4 +- .../chrome/content/evergreen/auth/auth.js | 15 +++++++ .../chrome/content/evergreen/util/error.js | 5 ++- .../chrome/content/evergreen/util/fm_utils.js | 6 +++ .../content/evergreen/util/util_overlay.xul | 43 +++++++++++++++---- .../chrome/content/evergreen/util/win.js | 2 +- 7 files changed, 67 insertions(+), 16 deletions(-) diff --git a/Evergreen/staff_client/Makefile b/Evergreen/staff_client/Makefile index f725594a9a..b53e9df89d 100644 --- a/Evergreen/staff_client/Makefile +++ b/Evergreen/staff_client/Makefile @@ -3,8 +3,9 @@ PACKAGE=Evergreen DESCRIPTION=Evergreen Staff Client BUILD=2005072719 -RETRIEVE_FIELDMAPPER=wget -N http://gapines.org/js/util/fieldmapper.js -RETRIEVE_ORG_TREE=wget -N http://gapines.org/js/util/OrgTree.js +RETRIEVE_FIELDMAPPER=wget -N http://spacely.georgialibraries.org:8080/opac/common/js/util/fieldmapper.js +RETRIEVE_FM_ALL=wget -N http://spacely.georgialibraries.org:8080/opac/common/js/fmall.js +RETRIEVE_ORG_TREE=wget -N http://spacely.georgialibraries.org:8080/opac/common/js/OrgTree.js RETRIEVE_CLIENT_CONFIG=cp ../../../../../../OpenSRF/examples/math_xul_client/math/content/conf/client_config.xml . all: build package @@ -36,9 +37,10 @@ stamp: generated: @echo @echo These things are installation specific. The staff client is the last thing you should try to build. - (cd chrome/content/evergreen/util ; ${RETRIEVE_FIELDMAPPER} ); + #(cd chrome/content/evergreen/util ; ${RETRIEVE_FIELDMAPPER} ); (cd chrome/content/evergreen/util ; ${RETRIEVE_ORG_TREE} ); (cd chrome/content/evergreen/conf ; ${RETRIEVE_CLIENT_CONFIG} ); + (cd chrome/content/evergreen/Open-ILS/util/ ; ${RETRIEVE_FM_ALL} ); open-ils: cp ../../OpenSRF/src/javascript/*.js chrome/content/evergreen/OpenSRF/ 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 2f4a13c072..afc208e1bf 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js +++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js @@ -4,7 +4,7 @@ function OpenILS_init(params) { try { switch(params.app) { - case 'Auth' : auth_init(params); break; + case 'Auth' : auth_init(params); dump('after auth_init\n'); break; case 'AppShell' : app_shell_init(params); register_AppShell(params.w); break; case 'Opac' : opac_init(params); break; case 'PatronSearch' : patron_search_init(params); break; @@ -18,7 +18,9 @@ function OpenILS_init(params) { try { //register_document(params.w.document); + dump('before register_window\n'); register_window(params.w); + dump('after register_window\n'); } catch(E) { sdump('D_ERROR',js2JSON(E)+'\n'); } sdump('D_TRACE_EXIT',arg_dump(arguments)); diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js index 53c8b21bb8..e5044ff7a0 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js +++ b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js @@ -47,15 +47,25 @@ var auth_meter_incr = 10; function auth_init() { sdump('D_AUTH','TESTING: auth.js: ' + mw.G['main_test_variable'] + '\n'); sdump('D_AUTH',arg_dump(arguments)); +dump('a1\n'); var np = document.getElementById('name_prompt'); +dump('a2\n'); np.addEventListener("keypress",handle_keypress,false); +dump('a3\n'); np.focus(); +dump('a4\n'); var pp = document.getElementById('password_prompt'); +dump('a5\n'); pp.addEventListener("keypress",handle_keypress,false); +dump('a6\n'); self.addEventListener("unload",nice_shutdown,false); +dump('a7\n'); G['sound'] = xp_sound_init(); +dump('a8\n'); //G.sound.beep(); +dump('a9\n'); snd_logon(); +dump('a10\n'); } function handle_keypress(ev) { @@ -337,10 +347,15 @@ function org_type_callback(request) { alert('Login failed on aout_list: ' + js2JSON(E)); enable_login_prompts(); return; }*/ mw.G.aout_list = aout_list; + dump('auth 0\n'); mw.G.aout_hash = convert_object_list_to_hash( aout_list ); + dump('auth 1\n'); mw.G.org_tree = globalOrgTree; + dump('auth 2\n'); mw.G.org_tree_hash = convert_object_list_to_hash( flatten_ou_branch( globalOrgTree ) ); + dump('auth 3\n'); mw.G.user_ou = find_ou( mw.G.org_tree, mw.G.user_ou ); + dump('auth 4\n'); user_async_request( 'open-ils.actor', diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/error.js b/Evergreen/staff_client/chrome/content/evergreen/util/error.js index a567137a2b..7ac7c48d14 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/error.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/error.js @@ -8,7 +8,7 @@ var debugDump = true; var arg_dump_full = false; var sdump_levels = { - 'D_NONE' : false, + 'D_NONE' : true, 'D_ALL' : false, 'D_ERROR' : true, 'D_TRACE' : false, @@ -155,7 +155,8 @@ function arg_dump(args,dump_these) { } else { s += '\targ #' + i + ' = '; try { - s += js2JSON( arg ); + //s += js2JSON( arg ); + s += arg; } catch(E) { s += arg; } diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/fm_utils.js b/Evergreen/staff_client/chrome/content/evergreen/util/fm_utils.js index 01cbd178d6..7936453749 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/fm_utils.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/fm_utils.js @@ -61,6 +61,12 @@ function flatten_ou_branch(branch) { return my_array; } +/* +function findOrgUnit(id) { + return find_ou(globalOrgTree, id); +} +*/ + function find_ou(tree,id) { if (typeof(id)=='object') { id = id.id(); } if (tree.id()==id) { diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul index e3b3b677f7..0841c75d54 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul @@ -19,13 +19,11 @@ + + + + + + + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/win.js b/Evergreen/staff_client/chrome/content/evergreen/util/win.js index 7df98dd8bc..059b5e09d8 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/win.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/win.js @@ -148,7 +148,7 @@ function unregister_AppShell(w) { } function register_window(w) { - sdump('D_WIN',arg_dump(arguments,{0:true})); + sdump('D_WIN',arg_dump(arguments,{0:false})); mw.G.win_list.push(w); mw.G.last_win = w; sdump('D_TRACE_EXIT',arg_dump(arguments)); -- 2.43.2