backport part of changeset 12252 for font_helper support, but really as a pre-requisi...

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

diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.js b/Open-ILS/xul/staff_client/server/cat/marcedit.js
index 376f438..f4bde78 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.js
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.js
@@ -80,6 +80,12 @@ function xml_escape_unicode ( str ) {
 
 function my_init() {
        try {
+
+        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+        if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+        JSAN.errorLevel = "die"; // none, warn, or die
+        JSAN.addRepository('/xul/server/');
+
                // Fake xulG for standalone...
                try {
                        window.xulG.record;
@@ -225,7 +231,6 @@ function my_init() {
 
                loadRecord(xml_record);
 
-
        } catch(E) {
                alert('FIXME, MARC Editor, my_init: ' + E);
        }

diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.xul b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
index 126da26..e72d379 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
@@ -9,15 +9,17 @@
 <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml" onload="my_init()">
+<?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml" onload="try { my_init(); font_helper(); } catch(E) { alert(E); }">
+
+<scripts id="openils_util_scripts"/>
+<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
 
 <script src="marcedit.js" type="application/x-javascript; e4x=1"/>
-<script src="/opac/common/js/CGI.js" type="application/x-javascript; e4x=1"/>
-<script src="/opac/common/js/JSON_v1.js" type="application/x-javascript; e4x=1"/>
 
 <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-<messagecatalog id="commonStrings" src="/xul/server/locale/<!--#echo var='locale'-->/common.properties" />
 
 <groupbox flex="0">
        <caption label="&staff.cat.marcedit.options.label;"/>