From: phasefx Date: Sun, 17 Jul 2005 15:22:58 +0000 (+0000) Subject: changes forced on new code by legacy code X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=23c53a8f1cf65a780bc24ee05a49a143defacf45;p=Evergreen.git changes forced on new code by legacy code git-svn-id: svn://svn.open-ils.org/ILS/trunk@1244 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Evergreen/staff_client/chrome/content/evergreen/opac/opac.js b/Evergreen/staff_client/chrome/content/evergreen/opac/opac.js index a8687a572f..7f9cbb98df 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/opac/opac.js +++ b/Evergreen/staff_client/chrome/content/evergreen/opac/opac.js @@ -4,93 +4,104 @@ sdump('D_OPAC','Loading opac.js\n'); var OPAC_URL = "http://gapines.org/opac/?top_target=advanced_search"; //var OPAC_URL = "http://google.com/"; -var opac_progressListener = new Object(); -var opac_iframe; -var opac_appframe; /* i hold the actual opac iframe */ - - /* init the opac */ function opac_init(p) { sdump('D_OPAC',"Initing OPAC\n"); var box = p.w.document.getElementById('opac_vbox'); - opac_iframe = box.appendChild(document.createElement("browser")); + p.opac_iframe = box.appendChild(document.createElement("browser")); + + p.opac_iframe.setAttribute("type", "content-primary"); + p.opac_iframe.setAttribute("id", "opac_opac_iframe"); + p.opac_iframe.setAttribute("flex", "1"); + p.opac_iframe.setAttribute("src", OPAC_URL) - opac_iframe.setAttribute("type", "content-primary"); - opac_iframe.setAttribute("id", "opac_opac_iframe"); - opac_iframe.setAttribute("flex", "1"); - opac_iframe.setAttribute("src", OPAC_URL) + opac_build_callbacks(p); - opac_iframe.contentWindow.IAMXUL = true; - opac_iframe.contentWindow.xulEvtRecordResultDisplayed - = xulEvtRecordResultDisplayed; + p.opac_iframe.contentWindow.IAMXUL = true; + p.opac_iframe.contentWindow.xulEvtRecordResultDisplayed + = p.xulEvtRecordResultDisplayed; - opac_iframe.contentWindow.xulEvtMRResultDisplayed - = xulEvtMRResultDisplayed; + p.opac_iframe.contentWindow.xulEvtMRResultDisplayed + = p.xulEvtMRResultDisplayed; - opac_iframe.contentWindow.xulEvtRecordDetailDisplayed - = xulEvtRecordDetailDisplayed; + p.opac_iframe.contentWindow.xulEvtRecordDetailDisplayed + = p.xulEvtRecordDetailDisplayed; /* shove BIG G in so global variables may be accessed */ - opac_iframe.contentWindow.G = mw.G; + p.opac_iframe.contentWindow.G = mw.G; } - -function webForward() { - try { - if(opac_iframe.webNavigation.canGoForward) - opac_iframe.webNavigation.goForward(); - } catch(E) { - sdump('D_OPAC','goForward error: ' + js2JSON(E) + '\n'); +function opac_build_navigation(p) { + p.webForward = function webForward() { + try { + if(p.opac_iframe.webNavigation.canGoForward) + p.opac_iframe.webNavigation.goForward(); + } catch(E) { + sdump('D_OPAC','goForward error: ' + js2JSON(E) + '\n'); + } } -} -function webBack() { - try { - if(opac_iframe.webNavigation.canGoBack) - opac_iframe.webNavigation.goBack(); - } catch(E) { - sdump('D_OPAC','goBack error: ' + js2JSON(E) + '\n'); + p.webBack = function webBack() { + try { + if(p.opac_iframe.webNavigation.canGoBack) + p.opac_iframe.webNavigation.goBack(); + } catch(E) { + sdump('D_OPAC','goBack error: ' + js2JSON(E) + '\n'); + } } } - /* -------------------------------------------------------------------------- XUL Callbacks -------------------------------------------------------------------------- */ +function opac_build_callbacks(p) { + p.xulEvtRecordResultDisplayed = function(ui_obj, record) { + ui_obj.addItem("Edit MARC", function() { + spawn_marc_editor( + p.w.app_shell, 'new_tab', 'main_tabbox', { + 'find_this_id' : record.doc_id() + } + ).find_this_id = record.doc_id(); + } + ); + + ui_obj.addItem("Open Copy Browser", function() { + spawn_copy_browser( + p.w.app_shell, 'new_tab', 'main_tabbox', { + 'find_this_id' : record.doc_id() + } + ).find_this_id = record.doc_id(); + } + ); -var xulEvtRecordResultDisplayed = function(ui_obj, record) { - ui_obj.addItem("Edit MARC", function() { - spawn_marc_editor( true, [ record.doc_id() ] ); - } - ); - - ui_obj.addItem("Open Copy Browser", function() { - spawn_copy_browser(true, [ record.doc_id() ]); - } - ); - -} - -var xulEvtMRResultDisplayed = function(ui_obj, record) { - sdump('D_OPAC',"xulEvtMRRsultsDisplayed()\n"); -} - + } -var xulEvtRecordDetailDisplayed = function(ui_obj, record) { - ui_obj.addItem("Edit MARC", function() { - spawn_marc_editor( true, [ record.doc_id() ] ); - } - ); + p.xulEvtMRResultDisplayed = function(ui_obj, record) { + sdump('D_OPAC',"xulEvtMRRsultsDisplayed()\n"); + } - ui_obj.addItem("Open Copy Browser", function() { - spawn_copy_browser(true, [ record.doc_id() ]); - } - ); + p.xulEvtRecordDetailDisplayed = function(ui_obj, record) { + ui_obj.addItem("Edit MARC", function() { + spawn_marc_editor( + p.w.app_shell, 'new_tab', 'main_tabbox', { + 'find_this_id' : record.doc_id() + } + ).find_this_id = record.doc_id(); + } + ); + + ui_obj.addItem("Open Copy Browser", function() { + spawn_copy_browser( + p.w.app_shell, 'new_tab', 'main_tabbox', { + 'find_this_id' : record.doc_id() + } + ).find_this_id = record.doc_id(); + } + ); + } } - - diff --git a/Evergreen/staff_client/chrome/content/evergreen/opac/opac.xul b/Evergreen/staff_client/chrome/content/evergreen/opac/opac.xul index 016dcd41bb..862e617aaa 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/opac/opac.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/opac/opac.xul @@ -2,8 +2,14 @@ diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/error.js b/Evergreen/staff_client/chrome/content/evergreen/util/error.js index 8ed1756eaf..d79239e138 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/error.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/error.js @@ -24,7 +24,7 @@ var sdump_levels = { 'D_AUTH' : false, - 'D_OPAC' : false, + 'D_OPAC' : true, 'D_PATRON_SEARCH' : false, 'D_PATRON_SEARCH_FORM' : false, @@ -40,6 +40,8 @@ var sdump_levels = { 'D_CHECKIN' : true, 'D_CHECKIN_ITEMS' : true, + 'D_CAT' : true, + 'D_PATRON_UTILS' : false, 'D_CIRC_UTILS' : false, @@ -48,7 +50,7 @@ var sdump_levels = { 'D_PRINT' : false, 'D_SES' : true, 'D_SES_FUNC' : false, - 'D_SPAWN' : false, + 'D_SPAWN' : true, 'D_STRING' : false, 'D_UTIL' : false, 'D_WIN' : false, diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js index 9d18d2a360..49876b7aab 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js @@ -3,11 +3,11 @@ function spawn_interface(d,placement,place,chrome,label,passthru_params,clone) { var w; switch(placement) { case 'new_tab' : - new_tab(d,place); + mw.new_tab(d,place); w = spawn_interface(d,'replace_tab',place,chrome,label,passthru_params,clone); break; case 'replace_tab' : - w = replace_tab(d,place,label,chrome); break; + w = mw.replace_tab(d,place,label,chrome); break; case 'new_window' : w = new_window( chrome, { 'window_name' : label } ); break; diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/util.js b/Evergreen/staff_client/chrome/content/evergreen/util/util.js index 235f468cca..5739ca6ba5 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/util.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/util.js @@ -47,7 +47,7 @@ function parse_render_string( obj_string, render_string, regexp ) { function getString( key ) { var s = ''; - var bundles = document.getElementById('string_bundles'); + var bundles = mw.document.getElementById('string_bundles'); sdump('D_STRING','bundles = ' + bundles + ' bundles.childNodes.length = ' + bundles.childNodes.length + '\n'); for (var i = 0; i < bundles.childNodes.length; i++) { var bundle = bundles.childNodes[i]; @@ -72,7 +72,7 @@ function getString( key ) { function getFormattedString( key, strArray ) { var s = ''; - var bundles = document.getElementById('string_bundles'); + var bundles = mw.document.getElementById('string_bundles'); for (var i = i; i < bundles.childNodes.length; i++) { var bundle = bundles[i]; try {